From: "Cédric Le Goater" <clg@fr.ibm.com>
To: lm-sensors@lm-sensors.org
Cc: "Stewart Smith" <stewart@linux.vnet.ibm.com>,
"Cédric Le Goater" <clg@fr.ibm.com>,
"Jean Delvare" <jdelvare@suse.de>,
"Neelesh Gupta" <neelegup@linux.vnet.ibm.com>,
skiboot@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org,
"Guenter Roeck" <linux@roeck-us.net>
Subject: [PATCH 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype
Date: Wed, 18 Mar 2015 16:47:44 +0100 [thread overview]
Message-ID: <1426693665-10797-5-git-send-email-clg@fr.ibm.com> (raw)
In-Reply-To: <1423117857-32759-1-git-send-email-clg@fr.ibm.com>
It simplifies the creation of the hwmon attributes and will help when
support for a new device tree layout is added. The patch also changes
the name of the routine to parse_opal_node_name().
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
drivers/hwmon/ibmpowernv.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
index edcc4ffa5ad0..570d2360b698 100644
--- a/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@ -155,28 +155,22 @@ static const char *convert_opal_attr_name(enum sensors type,
* which need to be mapped as fan2_input, temp1_max respectively before
* populating them inside hwmon device class.
*/
-static int create_hwmon_attr_name(struct device *dev, enum sensors type,
- const char *node_name,
- char *hwmon_attr_name)
+static int parse_opal_node_name(const char *node_name, enum sensors type,
+ u32 *index, const char **hwmon_attr_name)
{
char attr_suffix[MAX_ATTR_LEN];
const char *attr_name;
- u32 index;
int err;
- err = get_sensor_index_attr(node_name, &index, attr_suffix);
- if (err) {
- dev_err(dev, "Sensor device node name '%s' is invalid\n",
- node_name);
+ err = get_sensor_index_attr(node_name, index, attr_suffix);
+ if (err)
return err;
- }
attr_name = convert_opal_attr_name(type, attr_suffix);
if (!attr_name)
return -ENOENT;
- snprintf(hwmon_attr_name, MAX_ATTR_LEN, "%s%d_%s",
- sensor_groups[type].name, index, attr_name);
+ *hwmon_attr_name = attr_name;
return 0;
}
@@ -252,6 +246,9 @@ static int create_device_attrs(struct platform_device *pdev)
}
for_each_child_of_node(opal, np) {
+ const char *attr_name;
+ u32 opal_index;
+
if (np->name == NULL)
continue;
@@ -268,10 +265,17 @@ static int create_device_attrs(struct platform_device *pdev)
sdata[count].id = sensor_id;
sdata[count].type = type;
- err = create_hwmon_attr_name(&pdev->dev, type, np->name,
- sdata[count].name);
- if (err)
+
+ err = parse_opal_node_name(np->name, type, &opal_index,
+ &attr_name);
+ if (err) {
+ dev_err(&pdev->dev, "Sensor device node name '%s' is invalid\n",
+ np->name);
goto exit_put_node;
+ }
+
+ snprintf(sdata[count].name, MAX_ATTR_LEN, "%s%d_%s",
+ sensor_groups[type].name, opal_index, attr_name);
sysfs_attr_init(&sdata[count].dev_attr.attr);
sdata[count].dev_attr.attr.name = sdata[count].name;
--
1.7.10.4
next prev parent reply other threads:[~2015-03-18 15:47 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1423117857-32759-1-git-send-email-clg@fr.ibm.com>
2015-02-20 15:07 ` [RFC PATCH 0/3] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-02-20 16:52 ` Guenter Roeck
2015-02-20 20:15 ` Cedric Le Goater
2015-02-20 23:52 ` Guenter Roeck
2015-02-21 7:14 ` Cedric Le Goater
2015-02-21 11:03 ` Guenter Roeck
2015-02-23 10:54 ` Cedric Le Goater
2015-02-20 15:07 ` [RFC PATCH 1/3] powerpc/powernv: Check OPAL sensor calls exist Cédric Le Goater
2015-02-20 16:53 ` Guenter Roeck
2015-02-20 20:18 ` Cedric Le Goater
2015-02-24 4:54 ` Michael Ellerman
2015-02-25 17:28 ` Cedric Le Goater
2015-02-20 15:07 ` [RFC PATCH 2/3] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Cédric Le Goater
2015-02-20 15:07 ` [RFC PATCH 3/3] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-03-18 15:47 ` [PATCH 0/5] hwmon: (ibmpowernv) remove dependency on OPAL index Cédric Le Goater
2015-03-19 4:05 ` Guenter Roeck
2015-03-18 15:47 ` [PATCH 1/5] hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP Cédric Le Goater
2015-03-18 15:47 ` [PATCH 2/5] hwmon: (ibmpowernv) add a get_sensor_type() routine Cédric Le Goater
2015-03-18 15:47 ` [PATCH 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine Cédric Le Goater
2015-03-19 3:58 ` Guenter Roeck
2015-03-18 15:47 ` Cédric Le Goater [this message]
2015-03-19 4:02 ` [PATCH 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype Guenter Roeck
2015-03-18 15:47 ` [PATCH 5/5] hwmon: (ibmpowernv) do not use the OPAL index for hwmon attribute names Cédric Le Goater
2015-03-19 17:44 ` [PATCH v2 0/5] hwmon: (ibmpowernv) remove dependency on OPAL index Cédric Le Goater
2015-03-20 15:26 ` Guenter Roeck
2015-03-20 16:52 ` Cedric Le Goater
2015-04-01 10:15 ` [PATCH 0/4] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-04-01 10:15 ` [PATCH 1/4] hwmon: (ibmpowernv) add a helper routine create_hwmon_attr Cédric Le Goater
2015-04-01 10:15 ` [PATCH 2/4] hwmon: (ibmpowernv) add support for the new device tree Cédric Le Goater
2015-04-01 10:15 ` [PATCH 3/4] hwmon: (ibmpowernv) add a label attribute Cédric Le Goater
2015-04-01 10:15 ` [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels Cédric Le Goater
2015-04-03 15:49 ` Guenter Roeck
2015-04-07 14:42 ` Cedric Le Goater
2015-04-07 14:45 ` Cédric Le Goater
2015-04-07 16:44 ` Guenter Roeck
2015-04-07 18:03 ` Cedric Le Goater
2015-04-07 19:22 ` Guenter Roeck
2015-04-08 6:57 ` Cedric Le Goater
2015-04-07 20:22 ` [Skiboot] " Benjamin Herrenschmidt
2015-03-19 17:44 ` [PATCH v2 1/5] hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP Cédric Le Goater
2015-03-19 17:44 ` [PATCH v2 2/5] hwmon: (ibmpowernv) add a get_sensor_type() routine Cédric Le Goater
2015-03-19 17:44 ` [PATCH v2 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine Cédric Le Goater
2015-03-19 17:44 ` [PATCH v2 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype Cédric Le Goater
2015-03-20 8:06 ` Cedric Le Goater
2015-03-20 15:27 ` Guenter Roeck
2015-03-19 17:44 ` [PATCH v2 5/5] hwmon: (ibmpowernv) do not use the OPAL index for hwmon attribute names Cédric Le Goater
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=1426693665-10797-5-git-send-email-clg@fr.ibm.com \
--to=clg@fr.ibm.com \
--cc=jdelvare@suse.de \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lm-sensors@lm-sensors.org \
--cc=neelegup@linux.vnet.ibm.com \
--cc=skiboot@lists.ozlabs.org \
--cc=stewart@linux.vnet.ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).