net: phy: aquantia: 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://patch.msgid.link/20250210054710.12855-6-lihuisong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/aquantia/aquantia_hwmon.c b/drivers/net/phy/aquantia/aquantia_hwmon.c
index 7b3c49c3bf49b78a030976e2ddc2d35b0ee5c7e6..1a714b56b765a6bc5309e9db8bba8f2b94af2efc 100644 (file)
--- a/drivers/net/phy/aquantia/aquantia_hwmon.c
+++ b/drivers/net/phy/aquantia/aquantia_hwmon.c
@@ -172,33 +172,13 @@ static const struct hwmon_ops aqr_hwmon_ops = {
        .write = aqr_hwmon_write,
 };
 
-static u32 aqr_hwmon_chip_config[] = {
-       HWMON_C_REGISTER_TZ,
-       0,
-};
-
-static const struct hwmon_channel_info aqr_hwmon_chip = {
-       .type = hwmon_chip,
-       .config = aqr_hwmon_chip_config,
-};
-
-static u32 aqr_hwmon_temp_config[] = {
-       HWMON_T_INPUT |
-       HWMON_T_MAX | HWMON_T_MIN |
-       HWMON_T_MAX_ALARM | HWMON_T_MIN_ALARM |
-       HWMON_T_CRIT | HWMON_T_LCRIT |
-       HWMON_T_CRIT_ALARM | HWMON_T_LCRIT_ALARM,
-       0,
-};
-
-static const struct hwmon_channel_info aqr_hwmon_temp = {
-       .type = hwmon_temp,
-       .config = aqr_hwmon_temp_config,
-};
-
 static const struct hwmon_channel_info * const aqr_hwmon_info[] = {
-       &aqr_hwmon_chip,
-       &aqr_hwmon_temp,
+       HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
+       HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT |
+                          HWMON_T_MAX | HWMON_T_MIN |
+                          HWMON_T_MAX_ALARM | HWMON_T_MIN_ALARM |
+                          HWMON_T_CRIT | HWMON_T_LCRIT |
+                          HWMON_T_CRIT_ALARM | HWMON_T_LCRIT_ALARM),
        NULL,
 };