hwmon: (ltc4245) 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/ltc4245.c b/drivers/hwmon/ltc4245.c
index 34d0653ca6076eb674d74cad6d7c15a64bf8bba6..26542635de9b21538e9d83a6a835f2c781eb07f7 100644 (file)
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -390,57 +390,30 @@ static umode_t ltc4245_is_visible(const void *_data,
        }
 }
 
-static const u32 ltc4245_in_config[] = {
-       HWMON_I_INPUT,                  /* dummy, skipped in is_visible */
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT | HWMON_I_MIN_ALARM,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info ltc4245_in = {
-       .type = hwmon_in,
-       .config = ltc4245_in_config,
-};
-
-static const u32 ltc4245_curr_config[] = {
-       HWMON_C_INPUT | HWMON_C_MAX_ALARM,
-       HWMON_C_INPUT | HWMON_C_MAX_ALARM,
-       HWMON_C_INPUT | HWMON_C_MAX_ALARM,
-       HWMON_C_INPUT | HWMON_C_MAX_ALARM,
-       0
-};
-
-static const struct hwmon_channel_info ltc4245_curr = {
-       .type = hwmon_curr,
-       .config = ltc4245_curr_config,
-};
-
-static const u32 ltc4245_power_config[] = {
-       HWMON_P_INPUT,
-       HWMON_P_INPUT,
-       HWMON_P_INPUT,
-       HWMON_P_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info ltc4245_power = {
-       .type = hwmon_power,
-       .config = ltc4245_power_config,
-};
-
 static const struct hwmon_channel_info *ltc4245_info[] = {
-       &ltc4245_in,
-       &ltc4245_curr,
-       &ltc4245_power,
+       HWMON_CHANNEL_INFO(in,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT | HWMON_I_MIN_ALARM,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT),
+       HWMON_CHANNEL_INFO(curr,
+                          HWMON_C_INPUT | HWMON_C_MAX_ALARM,
+                          HWMON_C_INPUT | HWMON_C_MAX_ALARM,
+                          HWMON_C_INPUT | HWMON_C_MAX_ALARM,
+                          HWMON_C_INPUT | HWMON_C_MAX_ALARM),
+       HWMON_CHANNEL_INFO(power,
+                          HWMON_P_INPUT,
+                          HWMON_P_INPUT,
+                          HWMON_P_INPUT,
+                          HWMON_P_INPUT),
        NULL
 };