Commit e4f6fed1 authored Mar 31, 2019 by Guenter Roeck

hwmon: (lm75) 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 1eade10f

drivers/hwmon/lm75.c

+4 −28

Original line number	Diff line number	Diff line
		@@ -194,35 +194,11 @@ static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,
		return 0;
		}

		/-----------------------------------------------------------------------/

		/* device probe and removal */

		/* chip configuration */

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

		static const struct hwmon_channel_info lm75_chip = {
		.type = hwmon_chip,
		.config = lm75_chip_config,
		};

		static const u32 lm75_temp_config[] = {
		HWMON_T_INPUT \| HWMON_T_MAX \| HWMON_T_MAX_HYST,
		0
		};

		static const struct hwmon_channel_info lm75_temp = {
		.type = hwmon_temp,
		.config = lm75_temp_config,
		};

		static const struct hwmon_channel_info *lm75_info[] = {
		&lm75_chip,
		&lm75_temp,
		HWMON_CHANNEL_INFO(chip,
		HWMON_C_REGISTER_TZ \| HWMON_C_UPDATE_INTERVAL),
		HWMON_CHANNEL_INFO(temp,
		HWMON_T_INPUT \| HWMON_T_MAX \| HWMON_T_MAX_HYST),
		NULL
		};