Commit a4d41e67 authored Mar 31, 2019 by Guenter Roeck

hwmon: (lm90) 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>

parent e4f6fed1

drivers/hwmon/lm90.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -1720,16 +1720,6 @@ static void lm90_regulator_disable(void *regulator)
		regulator_disable(regulator);
		}

		static const u32 lm90_chip_config[] = {
		HWMON_C_REGISTER_TZ \| HWMON_C_UPDATE_INTERVAL \| HWMON_C_ALARMS,
		0
		};

		static const struct hwmon_channel_info lm90_chip_info = {
		.type = hwmon_chip,
		.config = lm90_chip_config,
		};


		static const struct hwmon_ops lm90_ops = {
		.is_visible = lm90_is_visible,
		@@ -1792,7 +1782,8 @@ static int lm90_probe(struct i2c_client *client,
		data->chip.ops = &lm90_ops;
		data->chip.info = data->info;

		data->info[0] = &lm90_chip_info;
		data->info[0] = HWMON_CHANNEL_INFO(chip,
		HWMON_C_REGISTER_TZ \| HWMON_C_UPDATE_INTERVAL \| HWMON_C_ALARMS);
		data->info[1] = &data->temp_info;

		info = &data->temp_info;