Skip to content

Commit

Permalink
platform/x86: asus-wmi: Rename CHARGE_THRESHOLD to RSOC
Browse files Browse the repository at this point in the history
The device is officially called "Relative state of charge" (RSOC).
At the same time add the missing DEVID from the name.

Signed-off-by: Kristian Klausen <kristian@klausen.dk>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  • Loading branch information
Kristian Klausen authored and Andy Shevchenko committed Sep 9, 2019
1 parent 7c28503 commit 0c37f44
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/platform/x86/asus-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ static ssize_t charge_threshold_store(struct device *dev,
if (value < 0 || value > 100)
return -EINVAL;

ret = asus_wmi_set_devstate(ASUS_WMI_CHARGE_THRESHOLD, value, &rv);
ret = asus_wmi_set_devstate(ASUS_WMI_DEVID_RSOC, value, &rv);
if (ret)
return ret;

Expand Down Expand Up @@ -2124,7 +2124,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
else if (attr == &dev_attr_fan_boost_mode.attr)
ok = asus->fan_boost_mode_available;
else if (attr == &dev_attr_charge_threshold.attr)
devid = ASUS_WMI_CHARGE_THRESHOLD;
devid = ASUS_WMI_DEVID_RSOC;

if (devid != -1)
ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0);
Expand Down Expand Up @@ -2455,7 +2455,7 @@ static int asus_wmi_add(struct platform_device *pdev)
* and we can't get the current threshold so let set it to 100% on
* module load.
*/
asus_wmi_set_devstate(ASUS_WMI_CHARGE_THRESHOLD, 100, NULL);
asus_wmi_set_devstate(ASUS_WMI_DEVID_RSOC, 100, NULL);
asus->charge_threshold = 100;

return 0;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/platform_data/x86/asus-wmi.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
#define ASUS_WMI_DEVID_LID_RESUME 0x00120031

/* Maximum charging percentage */
#define ASUS_WMI_CHARGE_THRESHOLD 0x00120057
#define ASUS_WMI_DEVID_RSOC 0x00120057

/* DSTS masks */
#define ASUS_WMI_DSTS_STATUS_BIT 0x00000001
Expand Down

0 comments on commit 0c37f44

Please sign in to comment.