Skip to content

Commit 6b767cc

Browse files
committed
hwmon: (as370-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. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent ddaefa2 commit 6b767cc

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

drivers/hwmon/as370-hwmon.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,8 @@ as370_hwmon_is_visible(const void *data, enum hwmon_sensor_types type,
7676
}
7777
}
7878

79-
static const u32 as370_hwmon_temp_config[] = {
80-
HWMON_T_INPUT,
81-
0
82-
};
83-
84-
static const struct hwmon_channel_info as370_hwmon_temp = {
85-
.type = hwmon_temp,
86-
.config = as370_hwmon_temp_config,
87-
};
88-
8979
static const struct hwmon_channel_info *as370_hwmon_info[] = {
90-
&as370_hwmon_temp,
80+
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
9181
NULL
9282
};
9383

0 commit comments

Comments
 (0)