net: nfp: 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-3-lihuisong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_hwmon.c b/drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
index 0d6c59d6d4aed048b322b589f41b7256f4924e75..ea6a288c0d5edb817755ddf3e0243b4291ae09f9 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
@@ -83,42 +83,12 @@ nfp_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,
        return 0;
 }
 
-static u32 nfp_chip_config[] = {
-       HWMON_C_REGISTER_TZ,
-       0
-};
-
-static const struct hwmon_channel_info nfp_chip = {
-       .type = hwmon_chip,
-       .config = nfp_chip_config,
-};
-
-static u32 nfp_temp_config[] = {
-       HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT,
-       0
-};
-
-static const struct hwmon_channel_info nfp_temp = {
-       .type = hwmon_temp,
-       .config = nfp_temp_config,
-};
-
-static u32 nfp_power_config[] = {
-       HWMON_P_INPUT | HWMON_P_MAX,
-       HWMON_P_INPUT,
-       HWMON_P_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info nfp_power = {
-       .type = hwmon_power,
-       .config = nfp_power_config,
-};
-
 static const struct hwmon_channel_info * const nfp_hwmon_info[] = {
-       &nfp_chip,
-       &nfp_temp,
-       &nfp_power,
+       HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
+       HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT),
+       HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_MAX,
+                          HWMON_P_INPUT,
+                          HWMON_P_INPUT),
        NULL
 };