Skip to content

Commit d6085a2

Browse files
LiHuiSong1kuba-moo
authored andcommitted
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>
1 parent 4798f48 commit d6085a2

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

drivers/net/phy/aquantia/aquantia_hwmon.c

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -172,33 +172,13 @@ static const struct hwmon_ops aqr_hwmon_ops = {
172172
.write = aqr_hwmon_write,
173173
};
174174

175-
static u32 aqr_hwmon_chip_config[] = {
176-
HWMON_C_REGISTER_TZ,
177-
0,
178-
};
179-
180-
static const struct hwmon_channel_info aqr_hwmon_chip = {
181-
.type = hwmon_chip,
182-
.config = aqr_hwmon_chip_config,
183-
};
184-
185-
static u32 aqr_hwmon_temp_config[] = {
186-
HWMON_T_INPUT |
187-
HWMON_T_MAX | HWMON_T_MIN |
188-
HWMON_T_MAX_ALARM | HWMON_T_MIN_ALARM |
189-
HWMON_T_CRIT | HWMON_T_LCRIT |
190-
HWMON_T_CRIT_ALARM | HWMON_T_LCRIT_ALARM,
191-
0,
192-
};
193-
194-
static const struct hwmon_channel_info aqr_hwmon_temp = {
195-
.type = hwmon_temp,
196-
.config = aqr_hwmon_temp_config,
197-
};
198-
199175
static const struct hwmon_channel_info * const aqr_hwmon_info[] = {
200-
&aqr_hwmon_chip,
201-
&aqr_hwmon_temp,
176+
HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ),
177+
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT |
178+
HWMON_T_MAX | HWMON_T_MIN |
179+
HWMON_T_MAX_ALARM | HWMON_T_MIN_ALARM |
180+
HWMON_T_CRIT | HWMON_T_LCRIT |
181+
HWMON_T_CRIT_ALARM | HWMON_T_LCRIT_ALARM),
202182
NULL,
203183
};
204184

0 commit comments

Comments
 (0)