hwmon: (max31790) Use HWMON_CHANNEL_INFO macro

The HWMON_CHANNEL_INFO macro simplifies the code, reduces the likelihood
of errors, and makes the code easier to read.

The conversion was done automatically with coccinelle. The semantic patch
used to make this change is as follows.

@r@
initializer list elements;
identifier i;
@@

-u32 i[] = {
-  elements,
-  0
-};

@s@
identifier r.i,j,ty;
@@

-struct hwmon_channel_info j = {
-       .type = ty,
-       .config = i,
-};

@script:ocaml t@
ty << s.ty;
elements << r.elements;
shorter;
elems;
@@

shorter :=
   make_ident (List.hd(List.rev (Str.split (Str.regexp "_") ty)));
elems :=
   make_ident
    (String.concat ","
     (List.map (fun x -> Printf.sprintf "\n\t\t\t   %s" x)
       (Str.split (Str.regexp " , ") elements)))

@@
identifier s.j,t.shorter;
identifier t.elems;
@@

- &j
+ HWMON_CHANNEL_INFO(shorter,elems)

This patch does not introduce functional changes. Many thanks to
Julia Lawall for providing the semantic patch.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
index 722bcbb..0b0b04d 100644 (file)
--- a/drivers/hwmon/max31790.c
+++ b/drivers/hwmon/max31790.c
@@ -400,45 +400,27 @@ static umode_t max31790_is_visible(const void *data,
        }
 }
 
-static const u32 max31790_fan_config[] = {
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       HWMON_F_INPUT | HWMON_F_FAULT,
-       0
-};
-
-static const struct hwmon_channel_info max31790_fan = {
-       .type = hwmon_fan,
-       .config = max31790_fan_config,
-};
-
-static const u32 max31790_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,
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
-       0
-};
-
-static const struct hwmon_channel_info max31790_pwm = {
-       .type = hwmon_pwm,
-       .config = max31790_pwm_config,
-};
-
 static const struct hwmon_channel_info *max31790_info[] = {
-       &max31790_fan,
-       &max31790_pwm,
+       HWMON_CHANNEL_INFO(fan,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_TARGET | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT,
+                          HWMON_F_INPUT | HWMON_F_FAULT),
+       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_PWM_INPUT | HWMON_PWM_ENABLE,
+                          HWMON_PWM_INPUT | HWMON_PWM_ENABLE),
        NULL
 };