Linux-Hwmon Archive on lore.kernel.org
 help / color / 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 05/17] hwmon: (lm90) Use HWMON_CHANNEL_INFO macro
Date: Mon,  1 Apr 2019 09:19:25 -0700
Message-ID: <1554135577-11889-6-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/lm90.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 480d70a51778..0f9c22b21ffa 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -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;
-- 
2.7.4


  parent reply index

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-01 16:19 [PATCH 00/17] hwmon: " 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 ` Guenter Roeck [this message]
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 ` [PATCH 09/17] hwmon: (ltq-cputemp) " Guenter Roeck
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-6-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

Linux-Hwmon Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-hwmon/0 linux-hwmon/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-hwmon linux-hwmon/ https://lore.kernel.org/linux-hwmon \
		linux-hwmon@vger.kernel.org
	public-inbox-index linux-hwmon

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-hwmon


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git