Skip to content

Commit e05427c

Browse files
LiHuiSong1kuba-moo
authored andcommitted
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>
1 parent 43a0d7f commit e05427c

File tree

1 file changed

+5
-35
lines changed

1 file changed

+5
-35
lines changed

drivers/net/ethernet/netronome/nfp/nfp_hwmon.c

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -83,42 +83,12 @@ nfp_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr,
8383
return 0;
8484
}
8585

86-
static u32 nfp_chip_config[] = {
87-
HWMON_C_REGISTER_TZ,
88-
0
89-
};
90-
91-
static const struct hwmon_channel_info nfp_chip = {
92-
.type = hwmon_chip,
93-
.config = nfp_chip_config,
94-
};
95-
96-
static u32 nfp_temp_config[] = {
97-
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT,
98-
0
99-
};
100-
101-
static const struct hwmon_channel_info nfp_temp = {
102-
.type = hwmon_temp,
103-
.config = nfp_temp_config,
104-
};
105-
106-
static u32 nfp_power_config[] = {
107-
HWMON_P_INPUT | HWMON_P_MAX,
108-
HWMON_P_INPUT,
109-
HWMON_P_INPUT,
110-
0
111-
};
112-
113-
static const struct hwmon_channel_info nfp_power = {
114-
.type = hwmon_power,
115-
.config = nfp_power_config,
116-
};
117-
11886
static const struct hwmon_channel_info * const nfp_hwmon_info[] = {
119-
&nfp_chip,
120-
&nfp_temp,
121-
&nfp_power,
87+
HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
88+
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT),
89+
HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_MAX,
90+
HWMON_P_INPUT,
91+
HWMON_P_INPUT),
12292
NULL
12393
};
12494

0 commit comments

Comments
 (0)