OSDN Git Service

platform/x86: thinkpad_acpi: Fix thermal_temp_input_attr sorting
authorHans de Goede <hdegoede@redhat.com>
Sun, 21 Nov 2021 19:11:29 +0000 (20:11 +0100)
committerHans de Goede <hdegoede@redhat.com>
Thu, 25 Nov 2021 15:19:07 +0000 (16:19 +0100)
Fix thermal_temp_input_attr sorting. Now that we use is_visible,
rather then registering only part of the thermal_temp_input_attr array,
putting attr 0-7 last is no longer needed.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Tested-by: Mark Pearson <mpearson@lenovo.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211121191129.256713-8-hdegoede@redhat.com
drivers/platform/x86/thinkpad_acpi.c

index 45b6804..59a75ac 100644 (file)
@@ -6267,14 +6267,6 @@ static struct sensor_device_attribute sensor_dev_attr_thermal_temp_input[] = {
        &sensor_dev_attr_thermal_temp_input[X].dev_attr.attr
 
 static struct attribute *thermal_temp_input_attr[] = {
-       THERMAL_ATTRS(8),
-       THERMAL_ATTRS(9),
-       THERMAL_ATTRS(10),
-       THERMAL_ATTRS(11),
-       THERMAL_ATTRS(12),
-       THERMAL_ATTRS(13),
-       THERMAL_ATTRS(14),
-       THERMAL_ATTRS(15),
        THERMAL_ATTRS(0),
        THERMAL_ATTRS(1),
        THERMAL_ATTRS(2),
@@ -6283,6 +6275,14 @@ static struct attribute *thermal_temp_input_attr[] = {
        THERMAL_ATTRS(5),
        THERMAL_ATTRS(6),
        THERMAL_ATTRS(7),
+       THERMAL_ATTRS(8),
+       THERMAL_ATTRS(9),
+       THERMAL_ATTRS(10),
+       THERMAL_ATTRS(11),
+       THERMAL_ATTRS(12),
+       THERMAL_ATTRS(13),
+       THERMAL_ATTRS(14),
+       THERMAL_ATTRS(15),
        NULL
 };