[PATCH v1 11/21] hwmon: (asus_wmi_sensors) Fix type of 'config' in struct hwmon_channel_info to u64
From: Huisong Li <lihuisong@huawei.com>
Date: 2025-01-21 06:57:37
Also in:
arm-scmi, linux-arm-kernel, linux-hwmon, linux-media, linux-rdma, linux-rtc, lkml, platform-driver-x86
Subsystem:
asus wmi hardware monitor driver, hardware monitoring, the rest · Maintainers:
Ed Brindley, Denis Pauk, Guenter Roeck, Linus Torvalds
The type of 'config' in struct hwmon_channel_info has been fixed to u64. Modify the related code in driver to avoid compiling failure. Signed-off-by: Huisong Li <lihuisong@huawei.com> --- drivers/hwmon/asus_wmi_sensors.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c
index c2dd7ff882f2..9593674fc5df 100644
--- a/drivers/hwmon/asus_wmi_sensors.c
+++ b/drivers/hwmon/asus_wmi_sensors.c@@ -126,7 +126,7 @@ static enum hwmon_sensor_types asus_data_types[] = { [WATER_FLOW] = hwmon_fan, }; -static u32 hwmon_attributes[hwmon_max] = { +static u64 hwmon_attributes[hwmon_max] = { [hwmon_chip] = HWMON_C_REGISTER_TZ, [hwmon_temp] = HWMON_T_INPUT | HWMON_T_LABEL, [hwmon_in] = HWMON_I_INPUT | HWMON_I_LABEL,
@@ -248,9 +248,9 @@ static int asus_wmi_get_item_count(u32 *count) static int asus_wmi_hwmon_add_chan_info(struct hwmon_channel_info *asus_wmi_hwmon_chan, struct device *dev, int num, - enum hwmon_sensor_types type, u32 config) + enum hwmon_sensor_types type, u64 config) { - u32 *cfg; + u64 *cfg; cfg = devm_kcalloc(dev, num + 1, sizeof(*cfg), GFP_KERNEL); if (!cfg)
@@ -258,7 +258,7 @@ static int asus_wmi_hwmon_add_chan_info(struct hwmon_channel_info *asus_wmi_hwmo asus_wmi_hwmon_chan->type = type; asus_wmi_hwmon_chan->config = cfg; - memset32(cfg, config, num); + memset64(cfg, config, num); return 0; }
--
2.22.0