hwmon: (npcm750-pwm-fan) 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.

Cc: Avi Fishman <avifishman70@gmail.com>
Cc: Tomer Maimon <tmaimon77@gmail.com>
Cc: Patrick Venture <venture@google.com>
Cc: Nancy Yuen <yuenn@google.com>
Cc: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c
index b3b907bdfb635ab37b0ea3699ed3b5b90c993385..1dc0cd452498de52a5465a57028289079d4f25f6 100644 (file)
--- a/drivers/hwmon/npcm750-pwm-fan.c
+++ b/drivers/hwmon/npcm750-pwm-fan.c
@@ -629,51 +629,33 @@ static umode_t npcm7xx_is_visible(const void *data,
        }
 }
 
-static const u32 npcm7xx_pwm_config[] = {
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       HWMON_PWM_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info npcm7xx_pwm = {
-       .type = hwmon_pwm,
-       .config = npcm7xx_pwm_config,
-};
-
-static const u32 npcm7xx_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,
-       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 npcm7xx_fan = {
-       .type = hwmon_fan,
-       .config = npcm7xx_fan_config,
-};
-
 static const struct hwmon_channel_info *npcm7xx_info[] = {
-       &npcm7xx_pwm,
-       &npcm7xx_fan,
+       HWMON_CHANNEL_INFO(pwm,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_INPUT,
+                          HWMON_PWM_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_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT,
+                          HWMON_F_INPUT),
        NULL
 };