From: Huisong Li <lihuisong@huawei.com>
Date: Fri, 24 Jan 2025 02:26:34 +0000 (+0800)
Subject: w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code
X-Git-Tag: v6.15-rc1~78^2~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c145297840dddf0dc23d5822159c26aba920d3;p=thirdparty%2Fkernel%2Flinux.git

w1: w1_therm: w1: Use HWMON_CHANNEL_INFO macro to simplify code

Use HWMON_CHANNEL_INFO macro to simplify code.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://lore.kernel.org/r/20250124022635.16647-9-lihuisong@huawei.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---

diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index c85e80c7e1307..9ccedb3264fb2 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -444,18 +444,8 @@ static int w1_read(struct device *dev, enum hwmon_sensor_types type,
 	}
 }
 
-static const u32 w1_temp_config[] = {
-	HWMON_T_INPUT,
-	0
-};
-
-static const struct hwmon_channel_info w1_temp = {
-	.type = hwmon_temp,
-	.config = w1_temp_config,
-};
-
 static const struct hwmon_channel_info * const w1_info[] = {
-	&w1_temp,
+	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
 	NULL
 };