1
0
Fork 0

hwmon: (raspberrypi-hwmon) 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>
hifive-unleashed-5.2
Guenter Roeck 2019-03-31 10:53:50 -07:00
parent dfeace0833
commit 0c42186e39
1 changed files with 2 additions and 11 deletions

View File

@ -86,18 +86,9 @@ static umode_t rpi_is_visible(const void *_data, enum hwmon_sensor_types type,
return 0444;
}
static const u32 rpi_in_config[] = {
HWMON_I_LCRIT_ALARM,
0
};
static const struct hwmon_channel_info rpi_in = {
.type = hwmon_in,
.config = rpi_in_config,
};
static const struct hwmon_channel_info *rpi_info[] = {
&rpi_in,
HWMON_CHANNEL_INFO(in,
HWMON_I_LCRIT_ALARM),
NULL
};