Over time many default patterns have emerged while adding functionality.
This patch consolidates those patterns in to a few macros to remove a lot
of copy/paste, and make it easier to add more of the same style of
features in the future.
Signed-off-by: Luke D. Jones <luke@xxxxxxxxxx>
---
drivers/platform/x86/asus-wmi.c | 215 ++++++--------------------------
1 file changed, 38 insertions(+), 177 deletions(-)
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index d016acb23789..5c03e28ff252 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -676,7 +676,7 @@ static void asus_wmi_input_exit(struct asus_wmi *asus)
static ssize_t rog_tunable_store(struct asus_wmi *asus,
struct attribute *attr,
const char *buf, size_t count,
- u32 min, u32 max, u32 defaultv,
+ u32 min, u32 max, int defaultv,
u32 *store_value, u32 wmi_dev)
{
int result, err, value;
@@ -685,7 +685,7 @@ static ssize_t rog_tunable_store(struct asus_wmi *asus,
if (result)
return result;
- if (value == -1 )
+ if (value == -1 && defaultv != -1)
value = defaultv;
if (value < min || value > max)
return -EINVAL;
@@ -708,6 +708,36 @@ static ssize_t rog_tunable_store(struct asus_wmi *asus,
return count;
}
+#define WMI_SIMPLE_STORE(_fname, _min, _max, _wmi) \
+static ssize_t _fname##_store(struct device *dev, \
+ struct device_attribute *attr, const char *buf, size_t count) \
+{ \
+ struct asus_wmi *asus = dev_get_drvdata(dev); \
+ return rog_tunable_store(asus, &attr->attr, buf, count, \
+ _min, _max, -1, NULL, _wmi); \
+}
+
+#define WMI_SIMPLE_SHOW(_fname, _fmt, _wmi) \
+static ssize_t _fname##_show(struct device *dev, \
+ struct device_attribute *attr, char *buf) \
+{ \
+ struct asus_wmi *asus = dev_get_drvdata(dev); \
+ u32 result; \
+ asus_wmi_get_devstate(asus, _wmi, &result); \
+ if (result < 0) \
+ return result; \
+ return sysfs_emit(buf, _fmt, result & ~ASUS_WMI_DSTS_PRESENCE_BIT); \
+}
+
+#define WMI_ATTR_SIMPLE_RW(_fname, _minv, _maxv, _wmi) \
+WMI_SIMPLE_STORE(_fname, _minv, _maxv, _wmi); \
+WMI_SIMPLE_SHOW(_fname, "%d\n", _wmi); \
+static DEVICE_ATTR_RW(_fname)
+
+#define WMI_ATTR_SIMPLE_RO(_fname, _wmi) \
+WMI_SIMPLE_SHOW(_fname, "%d\n", _wmi); \
+static DEVICE_ATTR_RO(_fname)
+
#define ROG_TUNABLE_STORE(_fname, _min, _max, _default, _wmi) \
static ssize_t _fname##_store(struct device *dev, \
struct device_attribute *attr, const char *buf, size_t count) \
@@ -761,6 +791,12 @@ ROG_ATTR_RW(nv_dynamic_boost,
NVIDIA_BOOST_MIN, nv_boost_max, nv_boost_default, ASUS_WMI_DEVID_NV_DYN_BOOST);
ROG_ATTR_RW(nv_temp_target,
NVIDIA_TEMP_MIN, nv_temp_max, nv_temp_default, ASUS_WMI_DEVID_NV_THERM_TARGET);
+/* Ally MCU Powersave */
+WMI_ATTR_SIMPLE_RW(mcu_powersave, 0, 1, ASUS_WMI_DEVID_MCU_POWERSAVE);
+WMI_ATTR_SIMPLE_RO(egpu_connected, ASUS_WMI_DEVID_EGPU_CONNECTED);
+WMI_ATTR_SIMPLE_RW(panel_od, 0, 1, ASUS_WMI_DEVID_PANEL_OD);
+WMI_ATTR_SIMPLE_RW(boot_sound, 0, 1, ASUS_WMI_DEVID_BOOT_SOUND);
+WMI_ATTR_SIMPLE_RO(charge_mode, ASUS_WMI_DEVID_CHARGE_MODE);
/* Tablet mode ****************************************************************/
@@ -776,22 +812,6 @@ static void asus_wmi_tablet_mode_get_state(struct asus_wmi *asus)
asus_wmi_tablet_sw_report(asus, result);
}
-/* Charging mode, 1=Barrel, 2=USB ******************************************/
-static ssize_t charge_mode_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct asus_wmi *asus = dev_get_drvdata(dev);
- int result, value;
-
- result = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_CHARGE_MODE, &value);
- if (result < 0)
- return result;
-
- return sysfs_emit(buf, "%d\n", value & 0xff);
-}
-
-static DEVICE_ATTR_RO(charge_mode);
-
/* dGPU ********************************************************************/
static ssize_t dgpu_disable_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -925,22 +945,6 @@ static ssize_t egpu_enable_store(struct device *dev,
}
static DEVICE_ATTR_RW(egpu_enable);
-/* Is eGPU connected? *********************************************************/
-static ssize_t egpu_connected_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct asus_wmi *asus = dev_get_drvdata(dev);
- int result;
-
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_EGPU_CONNECTED);
- if (result < 0)
- return result;
-
- return sysfs_emit(buf, "%d\n", result);
-}
-
-static DEVICE_ATTR_RO(egpu_connected);
-
/* gpu mux switch *************************************************************/
static ssize_t gpu_mux_mode_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -1128,53 +1132,6 @@ static const struct attribute_group *kbd_rgb_mode_groups[] = {
NULL,
};
-/* Ally MCU Powersave ********************************************************/
-static ssize_t mcu_powersave_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct asus_wmi *asus = dev_get_drvdata(dev);
- int result;
-
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_MCU_POWERSAVE);
- if (result < 0)
- return result;
-
- return sysfs_emit(buf, "%d\n", result);
-}
-
-static ssize_t mcu_powersave_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- int result, err;
- u32 enable;
-
- struct asus_wmi *asus = dev_get_drvdata(dev);
-
- result = kstrtou32(buf, 10, &enable);
- if (result)
- return result;
-
- if (enable > 1)
- return -EINVAL;
-
- err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MCU_POWERSAVE, enable, &result);
- if (err) {
- pr_warn("Failed to set MCU powersave: %d\n", err);
- return err;
- }
-
- if (result > 1) {
- pr_warn("Failed to set MCU powersave (result): 0x%x\n", result);
- return -EIO;
- }
-
- sysfs_notify(&asus->platform_device->dev.kobj, NULL, "mcu_powersave");
-
- return count;
-}
-static DEVICE_ATTR_RW(mcu_powersave);
-
/* Battery ********************************************************************/
/* The battery maximum charging percentage */
@@ -2002,102 +1959,6 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus)
return result;
}
-/* Panel Overdrive ************************************************************/
-static ssize_t panel_od_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct asus_wmi *asus = dev_get_drvdata(dev);
- int result;
-
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_PANEL_OD);
- if (result < 0)
- return result;
-
- return sysfs_emit(buf, "%d\n", result);
-}
-
-static ssize_t panel_od_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- int result, err;
- u32 overdrive;
-
- struct asus_wmi *asus = dev_get_drvdata(dev);
-
- result = kstrtou32(buf, 10, &overdrive);
- if (result)
- return result;
-
- if (overdrive > 1)
- return -EINVAL;
-
- err = asus_wmi_set_devstate(ASUS_WMI_DEVID_PANEL_OD, overdrive, &result);
-
- if (err) {
- pr_warn("Failed to set panel overdrive: %d\n", err);
- return err;
- }
-
- if (result > 1) {
- pr_warn("Failed to set panel overdrive (result): 0x%x\n", result);
- return -EIO;
- }
-
- sysfs_notify(&asus->platform_device->dev.kobj, NULL, "panel_od");
-
- return count;
-}
-static DEVICE_ATTR_RW(panel_od);
-
-/* Bootup sound ***************************************************************/
-
-static ssize_t boot_sound_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct asus_wmi *asus = dev_get_drvdata(dev);
- int result;
-
- result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_BOOT_SOUND);
- if (result < 0)
- return result;
-
- return sysfs_emit(buf, "%d\n", result);
-}
-
-static ssize_t boot_sound_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- int result, err;
- u32 snd;
-
- struct asus_wmi *asus = dev_get_drvdata(dev);
-
- result = kstrtou32(buf, 10, &snd);
- if (result)
- return result;
-
- if (snd > 1)
- return -EINVAL;
-
- err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BOOT_SOUND, snd, &result);
- if (err) {
- pr_warn("Failed to set boot sound: %d\n", err);
- return err;
- }
-
- if (result > 1) {
- pr_warn("Failed to set panel boot sound (result): 0x%x\n", result);
- return -EIO;
- }
-
- sysfs_notify(&asus->platform_device->dev.kobj, NULL, "boot_sound");
-
- return count;
-}
-static DEVICE_ATTR_RW(boot_sound);
-
/* Mini-LED mode **************************************************************/
static ssize_t mini_led_mode_show(struct device *dev,
struct device_attribute *attr, char *buf)
--
2.45.1
