hwmon: (w83773g) 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/w83773g.c b/drivers/hwmon/w83773g.c
index e858093..1f34d88 100644 (file)
--- a/drivers/hwmon/w83773g.c
+++ b/drivers/hwmon/w83773g.c
@@ -237,31 +237,13 @@ static umode_t w83773_is_visible(const void *data, enum hwmon_sensor_types type,
        return 0;
 }
 
-static const u32 w83773_chip_config[] = {
-       HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL,
-       0
-};
-
-static const struct hwmon_channel_info w83773_chip = {
-       .type = hwmon_chip,
-       .config = w83773_chip_config,
-};
-
-static const u32 w83773_temp_config[] = {
-       HWMON_T_INPUT,
-       HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,
-       HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,
-       0
-};
-
-static const struct hwmon_channel_info w83773_temp = {
-       .type = hwmon_temp,
-       .config = w83773_temp_config,
-};
-
 static const struct hwmon_channel_info *w83773_info[] = {
-       &w83773_chip,
-       &w83773_temp,
+       HWMON_CHANNEL_INFO(chip,
+                          HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),
+       HWMON_CHANNEL_INFO(temp,
+                          HWMON_T_INPUT,
+                          HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET,
+                          HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_OFFSET),
        NULL
 };