Skip to content

Commit ca53853

Browse files
committed
hwmon: (sl28cpld-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. @s@ identifier i,j,ty; @@ -struct hwmon_channel_info j = { - .type = ty, - .config = i, -}; @r@ initializer list elements; identifier s.i; @@ -u32 i[] = { - elements, - 0 -}; @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 coccinelle script. Cc: Michael Walle <michael@walle.cc> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 7282d2a commit ca53853

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

drivers/hwmon/sl28cpld-hwmon.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,8 @@ static int sl28cpld_hwmon_read(struct device *dev,
6767
return 0;
6868
}
6969

70-
static const u32 sl28cpld_hwmon_fan_config[] = {
71-
HWMON_F_INPUT,
72-
0
73-
};
74-
75-
static const struct hwmon_channel_info sl28cpld_hwmon_fan = {
76-
.type = hwmon_fan,
77-
.config = sl28cpld_hwmon_fan_config,
78-
};
79-
8070
static const struct hwmon_channel_info *sl28cpld_hwmon_info[] = {
81-
&sl28cpld_hwmon_fan,
71+
HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT),
8272
NULL
8373
};
8474

0 commit comments

Comments
 (0)