hwmon: (lm95245) 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/lm95245.c b/drivers/hwmon/lm95245.c
index e4cac3a..c7e04f2 100644 (file)
--- a/drivers/hwmon/lm95245.c
+++ b/drivers/hwmon/lm95245.c
@@ -545,32 +545,16 @@ static const struct regmap_config lm95245_regmap_config = {
        .use_single_write = true,
 };
 
-static const u32 lm95245_chip_config[] = {
-       HWMON_C_UPDATE_INTERVAL,
-       0
-};
-
-static const struct hwmon_channel_info lm95245_chip = {
-       .type = hwmon_chip,
-       .config = lm95245_chip_config,
-};
-
-static const u32 lm95245_temp_config[] = {
-       HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_CRIT_ALARM,
-       HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_CRIT |
-               HWMON_T_CRIT_HYST | HWMON_T_FAULT | HWMON_T_MAX_ALARM |
-               HWMON_T_CRIT_ALARM | HWMON_T_TYPE | HWMON_T_OFFSET,
-       0
-};
-
-static const struct hwmon_channel_info lm95245_temp = {
-       .type = hwmon_temp,
-       .config = lm95245_temp_config,
-};
-
 static const struct hwmon_channel_info *lm95245_info[] = {
-       &lm95245_chip,
-       &lm95245_temp,
+       HWMON_CHANNEL_INFO(chip,
+                          HWMON_C_UPDATE_INTERVAL),
+       HWMON_CHANNEL_INFO(temp,
+                          HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_CRIT_HYST |
+                          HWMON_T_CRIT_ALARM,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_FAULT |
+                          HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM |
+                          HWMON_T_TYPE | HWMON_T_OFFSET),
        NULL
 };