Skip to content

Commit 7c399d6

Browse files
committed
hwmon: (peci/dimmtemp) 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: Iwona Winiarska <iwona.winiarska@intel.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 09e02c8 commit 7c399d6

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

drivers/hwmon/peci/dimmtemp.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,10 @@ static int create_dimm_temp_label(struct peci_dimmtemp *priv, int chan)
300300
return 0;
301301
}
302302

303-
static const u32 peci_dimmtemp_temp_channel_config[] = {
304-
[0 ... DIMM_NUMS_MAX - 1] = HWMON_T_LABEL | HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT,
305-
0
306-
};
307-
308-
static const struct hwmon_channel_info peci_dimmtemp_temp_channel = {
309-
.type = hwmon_temp,
310-
.config = peci_dimmtemp_temp_channel_config,
311-
};
312-
313303
static const struct hwmon_channel_info *peci_dimmtemp_temp_info[] = {
314-
&peci_dimmtemp_temp_channel,
304+
HWMON_CHANNEL_INFO(temp,
305+
[0 ... DIMM_NUMS_MAX - 1] = HWMON_T_LABEL |
306+
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT),
315307
NULL
316308
};
317309

0 commit comments

Comments
 (0)