]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: msi-wmi-platform: Rename "data" variable
authorArmin Wolf <W_Armin@gmx.de>
Mon, 14 Apr 2025 14:04:52 +0000 (16:04 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tue, 15 Apr 2025 14:03:14 +0000 (17:03 +0300)
Rename the "data" variable inside msi_wmi_platform_read() to avoid
a name collision when the driver adds support for a state container
struct (that is to be called "data" too) in the future.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20250414140453.7691-1-W_Armin@gmx.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/msi-wmi-platform.c

index 9b5c7f8c79b0ddd410f90593f0d0022f38d6d147..e15681dfca8d7e693e64030622e90229b51cb880 100644 (file)
@@ -173,7 +173,7 @@ static int msi_wmi_platform_read(struct device *dev, enum hwmon_sensor_types typ
        struct wmi_device *wdev = dev_get_drvdata(dev);
        u8 input[32] = { 0 };
        u8 output[32];
-       u16 data;
+       u16 value;
        int ret;
 
        ret = msi_wmi_platform_query(wdev, MSI_PLATFORM_GET_FAN, input, sizeof(input), output,
@@ -181,11 +181,11 @@ static int msi_wmi_platform_read(struct device *dev, enum hwmon_sensor_types typ
        if (ret < 0)
                return ret;
 
-       data = get_unaligned_be16(&output[channel * 2 + 1]);
-       if (!data)
+       value = get_unaligned_be16(&output[channel * 2 + 1]);
+       if (!value)
                *val = 0;
        else
-               *val = 480000 / data;
+               *val = 480000 / value;
 
        return 0;
 }