hwmon: (nct7904) Use new HWMON_CHANNEL_INFO() macro
authorGuenter Roeck <linux@roeck-us.net>
Fri, 29 Mar 2019 20:26:40 +0000 (13:26 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 16 Apr 2019 00:19:53 +0000 (17:19 -0700)
The new macro simplifies the code, reduces the likelihood of errors,
and makes the code easier to read.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/nct7904.c

index 82c7de7..0451678 100644 (file)
@@ -400,89 +400,53 @@ static int nct7904_detect(struct i2c_client *client,
        return 0;
 }
 
-static const u32 nct7904_in_config[] = {
-       HWMON_I_INPUT,                  /* dummy, skipped in is_visible */
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info nct7904_in = {
-       .type = hwmon_in,
-       .config = nct7904_in_config,
-};
-
-static const u32 nct7904_fan_config[] = {
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       HWMON_F_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info nct7904_fan = {
-       .type = hwmon_fan,
-       .config = nct7904_fan_config,
-};
-
-static const u32 nct7904_pwm_config[] = {
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       0
-};
-
-static const struct hwmon_channel_info nct7904_pwm = {
-       .type = hwmon_pwm,
-       .config = nct7904_pwm_config,
-};
-
-static const u32 nct7904_temp_config[] = {
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       HWMON_T_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info nct7904_temp = {
-       .type = hwmon_temp,
-       .config = nct7904_temp_config,
-};
-
 static const struct hwmon_channel_info *nct7904_info[] = {
-       &nct7904_in,
-       &nct7904_fan,
-       &nct7904_pwm,
-       &nct7904_temp,
+       HWMON_CHANNEL_INFO(in,
+                          HWMON_I_INPUT, /* dummy, skipped in is_visible */
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT),
+       HWMON_CHANNEL_INFO(fan,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT),
+       HWMON_CHANNEL_INFO(pwm,
+                          HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
+                          HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
+                          HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
+                          HWMON_PWM_INPUT | HWMON_PWM_ENABLE),
+       HWMON_CHANNEL_INFO(temp,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT),
        NULL
 };