]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: phy: marvell10g: Use HWMON_CHANNEL_INFO macro to simplify code
authorHuisong Li <lihuisong@huawei.com>
Mon, 10 Feb 2025 05:47:09 +0000 (13:47 +0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 12 Feb 2025 01:07:02 +0000 (17:07 -0800)
Use HWMON_CHANNEL_INFO macro to simplify code.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://patch.msgid.link/20250210054710.12855-5-lihuisong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/marvell10g.c

index 623bdb8466b86020e4176ddbe2ce8ce2e4ccd520..5354c8895163a647a275494e98629530364dd12c 100644 (file)
@@ -230,29 +230,9 @@ static const struct hwmon_ops mv3310_hwmon_ops = {
        .read = mv3310_hwmon_read,
 };
 
-static u32 mv3310_hwmon_chip_config[] = {
-       HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,
-       0,
-};
-
-static const struct hwmon_channel_info mv3310_hwmon_chip = {
-       .type = hwmon_chip,
-       .config = mv3310_hwmon_chip_config,
-};
-
-static u32 mv3310_hwmon_temp_config[] = {
-       HWMON_T_INPUT,
-       0,
-};
-
-static const struct hwmon_channel_info mv3310_hwmon_temp = {
-       .type = hwmon_temp,
-       .config = mv3310_hwmon_temp_config,
-};
-
 static const struct hwmon_channel_info * const mv3310_hwmon_info[] = {
-       &mv3310_hwmon_chip,
-       &mv3310_hwmon_temp,
+       HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),
+       HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
        NULL,
 };