Skip to content

Commit 9070d86

Browse files
committed
hwmon: (mr75203) 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: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent c2e8134 commit 9070d86

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

drivers/hwmon/mr75203.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,6 @@ static int pvt_read(struct device *dev, enum hwmon_sensor_types type,
223223
}
224224
}
225225

226-
static const u32 pvt_chip_config[] = {
227-
HWMON_C_REGISTER_TZ,
228-
0
229-
};
230-
231-
static const struct hwmon_channel_info pvt_chip = {
232-
.type = hwmon_chip,
233-
.config = pvt_chip_config,
234-
};
235-
236226
static struct hwmon_channel_info pvt_temp = {
237227
.type = hwmon_temp,
238228
};
@@ -555,7 +545,7 @@ static int mr75203_probe(struct platform_device *pdev)
555545
pvt_info = devm_kcalloc(dev, val + 2, sizeof(*pvt_info), GFP_KERNEL);
556546
if (!pvt_info)
557547
return -ENOMEM;
558-
pvt_info[0] = &pvt_chip;
548+
pvt_info[0] = HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ);
559549
index = 1;
560550

561551
if (ts_num) {

0 commit comments

Comments
 (0)