platform/x86: thinkpad_acpi: use standard charge control attribute names

The standard attributes were only introduced after the ones from
thinkpad_acpi in commit 813cab8f3994 ("power: supply: core:
Add CHARGE_CONTROL_{START_THRESHOLD,END_THRESHOLD} properties").

The new standard attributes are aliased to their previous names,
preserving backwards compatibility.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 54c4ef1094fe60eab6691ab6a023052859d7fcf6..9eda2f84a3cf9863f1a6fcf1bfaec486f2abcc1e 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9603,38 +9603,52 @@ static ssize_t tpacpi_battery_show(int what,
        return sprintf(buf, "%d\n", ret);
 }
 
-static ssize_t charge_start_threshold_show(struct device *device,
+static ssize_t charge_control_start_threshold_show(struct device *device,
                                struct device_attribute *attr,
                                char *buf)
 {
        return tpacpi_battery_show(THRESHOLD_START, device, buf);
 }
 
-static ssize_t charge_stop_threshold_show(struct device *device,
+static ssize_t charge_control_end_threshold_show(struct device *device,
                                struct device_attribute *attr,
                                char *buf)
 {
        return tpacpi_battery_show(THRESHOLD_STOP, device, buf);
 }
 
-static ssize_t charge_start_threshold_store(struct device *dev,
+static ssize_t charge_control_start_threshold_store(struct device *dev,
                                struct device_attribute *attr,
                                const char *buf, size_t count)
 {
        return tpacpi_battery_store(THRESHOLD_START, dev, buf, count);
 }
 
-static ssize_t charge_stop_threshold_store(struct device *dev,
+static ssize_t charge_control_end_threshold_store(struct device *dev,
                                struct device_attribute *attr,
                                const char *buf, size_t count)
 {
        return tpacpi_battery_store(THRESHOLD_STOP, dev, buf, count);
 }
 
-static DEVICE_ATTR_RW(charge_start_threshold);
-static DEVICE_ATTR_RW(charge_stop_threshold);
+static DEVICE_ATTR_RW(charge_control_start_threshold);
+static DEVICE_ATTR_RW(charge_control_end_threshold);
+struct device_attribute dev_attr_charge_start_threshold = __ATTR(
+       charge_start_threshold,
+       0644,
+       charge_control_start_threshold_show,
+       charge_control_start_threshold_store
+);
+struct device_attribute dev_attr_charge_stop_threshold = __ATTR(
+       charge_stop_threshold,
+       0644,
+       charge_control_end_threshold_show,
+       charge_control_end_threshold_store
+);
 
 static struct attribute *tpacpi_battery_attrs[] = {
+       &dev_attr_charge_control_start_threshold.attr,
+       &dev_attr_charge_control_end_threshold.attr,
        &dev_attr_charge_start_threshold.attr,
        &dev_attr_charge_stop_threshold.attr,
        NULL,