hwmon: (ina3221) 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.

The patch was post-edited to retain comments.

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

diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 3626b87..e6f43df 100644 (file)
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -458,44 +458,26 @@ static umode_t ina3221_is_visible(const void *drvdata,
        }
 }
 
-static const u32 ina3221_in_config[] = {
-       /* 0: dummy, skipped in is_visible */
-       HWMON_I_INPUT,
-       /* 1-3: input voltage Channels */
-       HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
-       HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
-       HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
-       /* 4-6: shunt voltage Channels */
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       HWMON_I_INPUT,
-       0
-};
-
-static const struct hwmon_channel_info ina3221_in = {
-       .type = hwmon_in,
-       .config = ina3221_in_config,
-};
-
 #define INA3221_HWMON_CURR_CONFIG (HWMON_C_INPUT | \
                                   HWMON_C_CRIT | HWMON_C_CRIT_ALARM | \
                                   HWMON_C_MAX | HWMON_C_MAX_ALARM)
 
-static const u32 ina3221_curr_config[] = {
-       INA3221_HWMON_CURR_CONFIG,
-       INA3221_HWMON_CURR_CONFIG,
-       INA3221_HWMON_CURR_CONFIG,
-       0
-};
-
-static const struct hwmon_channel_info ina3221_curr = {
-       .type = hwmon_curr,
-       .config = ina3221_curr_config,
-};
-
 static const struct hwmon_channel_info *ina3221_info[] = {
-       &ina3221_in,
-       &ina3221_curr,
+       HWMON_CHANNEL_INFO(in,
+                          /* 0: dummy, skipped in is_visible */
+                          HWMON_I_INPUT,
+                          /* 1-3: input voltage Channels */
+                          HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
+                          /* 4-6: shunt voltage Channels */
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT,
+                          HWMON_I_INPUT),
+       HWMON_CHANNEL_INFO(curr,
+                          INA3221_HWMON_CURR_CONFIG,
+                          INA3221_HWMON_CURR_CONFIG,
+                          INA3221_HWMON_CURR_CONFIG),
        NULL
 };