All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Hardware Monitoring <linux-hwmon@vger.kernel.org>
Cc: Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 09/17] hwmon: (ltq-cputemp) Use HWMON_CHANNEL_INFO macro
Date: Mon,  1 Apr 2019 09:19:29 -0700	[thread overview]
Message-ID: <1554135577-11889-10-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1554135577-11889-1-git-send-email-linux@roeck-us.net>

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>
---
 drivers/hwmon/ltq-cputemp.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/drivers/hwmon/ltq-cputemp.c b/drivers/hwmon/ltq-cputemp.c
index 1d33f94594c1..570791f0e024 100644
--- a/drivers/hwmon/ltq-cputemp.c
+++ b/drivers/hwmon/ltq-cputemp.c
@@ -77,29 +77,11 @@ static umode_t ltq_is_visible(const void *_data, enum hwmon_sensor_types type,
 	}
 }
 
-static const u32 ltq_chip_config[] = {
-	HWMON_C_REGISTER_TZ,
-	0
-};
-
-static const struct hwmon_channel_info ltq_chip = {
-	.type = hwmon_chip,
-	.config = ltq_chip_config,
-};
-
-static const u32 ltq_temp_config[] = {
-	HWMON_T_INPUT,
-	0
-};
-
-static const struct hwmon_channel_info ltq_temp = {
-	.type = hwmon_temp,
-	.config = ltq_temp_config,
-};
-
 static const struct hwmon_channel_info *ltq_info[] = {
-	&ltq_chip,
-	&ltq_temp,
+	HWMON_CHANNEL_INFO(chip,
+			   HWMON_C_REGISTER_TZ),
+	HWMON_CHANNEL_INFO(temp,
+			   HWMON_T_INPUT),
 	NULL
 };
 
-- 
2.7.4


  parent reply	other threads:[~2019-04-01 16:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-01 16:19 [PATCH 00/17] hwmon: Use HWMON_CHANNEL_INFO macro Guenter Roeck
2019-04-01 16:19 ` [PATCH 01/17] hwmon: (adt7411) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 02/17] hwmon: (ina3221) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 03/17] hwmon: (jc42) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 04/17] hwmon: (lm75) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 05/17] hwmon: (lm90) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 06/17] hwmon: (lm95241) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 07/17] hwmon: (lm95245) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 08/17] hwmon: (ltc4245) " Guenter Roeck
2019-04-01 16:19 ` Guenter Roeck [this message]
2019-04-01 16:19 ` [PATCH 10/17] hwmon: (max31790) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 11/17] hwmon: (max6621) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 12/17] hwmon: (mlxreg-fan) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 13/17] hwmon: (npcm750-pwm-fan) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 14/17] hwmon: (raspberrypi-hwmon) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 15/17] hwmon: (tmp102) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 16/17] hwmon: (tmp108) " Guenter Roeck
2019-04-01 16:19 ` [PATCH 17/17] hwmon: (w83773g) " Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1554135577-11889-10-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=jdelvare@suse.com \
    --cc=linux-hwmon@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.