platform/x86: Use device_show_string() helper for sysfs attributes

Deduplicate sysfs ->show() callbacks which expose a string at a static
memory location.  Use the newly introduced device_show_string() helper
in the driver core instead by declaring those sysfs attributes with
DEVICE_STRING_ATTR_RO().

No functional change intended.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/3ae8c9a73fbb291c1c863777af175c657a2a10e9.1713608122.git.lukas@wunner.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 3f07bbf809ef01990c7e3bc64f02dc4eddfaf435..78d7579b2fdd7d4f59a962a407254e95d9174378 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -915,17 +915,12 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,
 }
 static DEVICE_ATTR_WO(kbd_rgb_mode);
 
-static ssize_t kbd_rgb_mode_index_show(struct device *device,
-                                                struct device_attribute *attr,
-                                                char *buf)
-{
-       return sysfs_emit(buf, "%s\n", "cmd mode red green blue speed");
-}
-static DEVICE_ATTR_RO(kbd_rgb_mode_index);
+static DEVICE_STRING_ATTR_RO(kbd_rgb_mode_index, 0444,
+                            "cmd mode red green blue speed");
 
 static struct attribute *kbd_rgb_mode_attrs[] = {
        &dev_attr_kbd_rgb_mode.attr,
-       &dev_attr_kbd_rgb_mode_index.attr,
+       &dev_attr_kbd_rgb_mode_index.attr.attr,
        NULL,
 };
 
@@ -967,17 +962,12 @@ static ssize_t kbd_rgb_state_store(struct device *dev,
 }
 static DEVICE_ATTR_WO(kbd_rgb_state);
 
-static ssize_t kbd_rgb_state_index_show(struct device *device,
-                                                struct device_attribute *attr,
-                                                char *buf)
-{
-       return sysfs_emit(buf, "%s\n", "cmd boot awake sleep keyboard");
-}
-static DEVICE_ATTR_RO(kbd_rgb_state_index);
+static DEVICE_STRING_ATTR_RO(kbd_rgb_state_index, 0444,
+                            "cmd boot awake sleep keyboard");
 
 static struct attribute *kbd_rgb_state_attrs[] = {
        &dev_attr_kbd_rgb_state.attr,
-       &dev_attr_kbd_rgb_state_index.attr,
+       &dev_attr_kbd_rgb_state_index.attr.attr,
        NULL,
 };
 
@@ -2493,13 +2483,6 @@ static ssize_t pwm1_enable_store(struct device *dev,
        return count;
 }
 
-static ssize_t fan1_label_show(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-       return sysfs_emit(buf, "%s\n", ASUS_FAN_DESC);
-}
-
 static ssize_t asus_hwmon_temp1(struct device *dev,
                                struct device_attribute *attr,
                                char *buf)
@@ -2534,13 +2517,6 @@ static ssize_t fan2_input_show(struct device *dev,
        return sysfs_emit(buf, "%d\n", value * 100);
 }
 
-static ssize_t fan2_label_show(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-       return sysfs_emit(buf, "%s\n", ASUS_GPU_FAN_DESC);
-}
-
 /* Middle/Center fan on modern ROG laptops */
 static ssize_t fan3_input_show(struct device *dev,
                                        struct device_attribute *attr,
@@ -2559,13 +2535,6 @@ static ssize_t fan3_input_show(struct device *dev,
        return sysfs_emit(buf, "%d\n", value * 100);
 }
 
-static ssize_t fan3_label_show(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-       return sysfs_emit(buf, "%s\n", ASUS_MID_FAN_DESC);
-}
-
 static ssize_t pwm2_enable_show(struct device *dev,
                                struct device_attribute *attr,
                                char *buf)
@@ -2662,15 +2631,16 @@ static ssize_t pwm3_enable_store(struct device *dev,
 static DEVICE_ATTR_RW(pwm1);
 static DEVICE_ATTR_RW(pwm1_enable);
 static DEVICE_ATTR_RO(fan1_input);
-static DEVICE_ATTR_RO(fan1_label);
+static DEVICE_STRING_ATTR_RO(fan1_label, 0444, ASUS_FAN_DESC);
+
 /* Fan2 - GPU fan */
 static DEVICE_ATTR_RW(pwm2_enable);
 static DEVICE_ATTR_RO(fan2_input);
-static DEVICE_ATTR_RO(fan2_label);
+static DEVICE_STRING_ATTR_RO(fan2_label, 0444, ASUS_GPU_FAN_DESC);
 /* Fan3 - Middle/center fan */
 static DEVICE_ATTR_RW(pwm3_enable);
 static DEVICE_ATTR_RO(fan3_input);
-static DEVICE_ATTR_RO(fan3_label);
+static DEVICE_STRING_ATTR_RO(fan3_label, 0444, ASUS_MID_FAN_DESC);
 
 /* Temperature */
 static DEVICE_ATTR(temp1_input, S_IRUGO, asus_hwmon_temp1, NULL);
@@ -2681,11 +2651,11 @@ static struct attribute *hwmon_attributes[] = {
        &dev_attr_pwm2_enable.attr,
        &dev_attr_pwm3_enable.attr,
        &dev_attr_fan1_input.attr,
-       &dev_attr_fan1_label.attr,
+       &dev_attr_fan1_label.attr.attr,
        &dev_attr_fan2_input.attr,
-       &dev_attr_fan2_label.attr,
+       &dev_attr_fan2_label.attr.attr,
        &dev_attr_fan3_input.attr,
-       &dev_attr_fan3_label.attr,
+       &dev_attr_fan3_label.attr.attr,
 
        &dev_attr_temp1_input.attr,
        NULL
@@ -2702,17 +2672,17 @@ static umode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
                if (asus->fan_type != FAN_TYPE_AGFN)
                        return 0;
        } else if (attr == &dev_attr_fan1_input.attr
-           || attr == &dev_attr_fan1_label.attr
+           || attr == &dev_attr_fan1_label.attr.attr
            || attr == &dev_attr_pwm1_enable.attr) {
                if (asus->fan_type == FAN_TYPE_NONE)
                        return 0;
        } else if (attr == &dev_attr_fan2_input.attr
-           || attr == &dev_attr_fan2_label.attr
+           || attr == &dev_attr_fan2_label.attr.attr
            || attr == &dev_attr_pwm2_enable.attr) {
                if (asus->gpu_fan_type == FAN_TYPE_NONE)
                        return 0;
        } else if (attr == &dev_attr_fan3_input.attr
-           || attr == &dev_attr_fan3_label.attr
+           || attr == &dev_attr_fan3_label.attr.attr
            || attr == &dev_attr_pwm3_enable.attr) {
                if (asus->mid_fan_type == FAN_TYPE_NONE)
                        return 0;

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 82429e59999da211429220aefc7896d01eff3e3e..47a64a213d14deb3b7e331d828ab9fca6ef3ba3f 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -10991,13 +10991,7 @@ static struct ibm_struct auxmac_data = {
        .name = "auxmac",
 };
 
-static ssize_t auxmac_show(struct device *dev,
-                          struct device_attribute *attr,
-                          char *buf)
-{
-       return sysfs_emit(buf, "%s\n", auxmac);
-}
-static DEVICE_ATTR_RO(auxmac);
+static DEVICE_STRING_ATTR_RO(auxmac, 0444, auxmac);
 
 static umode_t auxmac_attr_is_visible(struct kobject *kobj,
                                      struct attribute *attr, int n)
@@ -11006,7 +11000,7 @@ static umode_t auxmac_attr_is_visible(struct kobject *kobj,
 }
 
 static struct attribute *auxmac_attributes[] = {
-       &dev_attr_auxmac.attr,
+       &dev_attr_auxmac.attr.attr,
        NULL
 };
 

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 77244c9aa60d233dd35316d764158ab6dcc378ae..5d8cdd2916b0da9975ae1629a631bae298388838 100644 (file)
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1815,12 +1815,7 @@ static DECLARE_WORK(kbd_bl_work, toshiba_acpi_kbd_bl_work);
 /*
  * Sysfs files
  */
-static ssize_t version_show(struct device *dev,
-                           struct device_attribute *attr, char *buf)
-{
-       return sprintf(buf, "%s\n", TOSHIBA_ACPI_VERSION);
-}
-static DEVICE_ATTR_RO(version);
+static DEVICE_STRING_ATTR_RO(version, 0444, TOSHIBA_ACPI_VERSION);
 
 static ssize_t fan_store(struct device *dev,
                         struct device_attribute *attr,
@@ -2429,7 +2424,7 @@ static ssize_t cooling_method_store(struct device *dev,
 static DEVICE_ATTR_RW(cooling_method);
 
 static struct attribute *toshiba_attributes[] = {
-       &dev_attr_version.attr,
+       &dev_attr_version.attr.attr,
        &dev_attr_fan.attr,
        &dev_attr_kbd_backlight_mode.attr,
        &dev_attr_kbd_type.attr,