From: Guenter Roeck <linux@roeck-us.net>
To: "Cédric Le Goater" <clg@fr.ibm.com>, lm-sensors@lm-sensors.org
Cc: Stewart Smith <stewart@linux.vnet.ibm.com>,
Neelesh Gupta <neelegup@linux.vnet.ibm.com>,
skiboot@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org,
Jean Delvare <jdelvare@suse.de>
Subject: Re: [lm-sensors] [PATCH 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype
Date: Thu, 19 Mar 2015 04:02:02 +0000 [thread overview]
Message-ID: <550A4A3A.3090406@roeck-us.net> (raw)
In-Reply-To: <1426693665-10797-5-git-send-email-clg@fr.ibm.com>
T24gMDMvMTgvMjAxNSAwODo0NyBBTSwgQ8OpZHJpYyBMZSBHb2F0ZXIgd3JvdGU6Cj4gSXQgc2lt
cGxpZmllcyB0aGUgY3JlYXRpb24gb2YgdGhlIGh3bW9uIGF0dHJpYnV0ZXMgYW5kIHdpbGwgaGVs
cCB3aGVuCj4gc3VwcG9ydCBmb3IgYSBuZXcgZGV2aWNlIHRyZWUgbGF5b3V0IGlzIGFkZGVkLiBU
aGUgcGF0Y2ggYWxzbyBjaGFuZ2VzCj4gdGhlIG5hbWUgb2YgdGhlIHJvdXRpbmUgdG8gcGFyc2Vf
b3BhbF9ub2RlX25hbWUoKS4KPgo+IFNpZ25lZC1vZmYtYnk6IEPDqWRyaWMgTGUgR29hdGVyIDxj
bGdAZnIuaWJtLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvaHdtb24vaWJtcG93ZXJudi5jIHwgICAz
MiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDE4
IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
aHdtb24vaWJtcG93ZXJudi5jIGIvZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMKPiBpbmRleCBl
ZGNjNGZmYTVhZDAuLjU3MGQyMzYwYjY5OCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2h3bW9uL2li
bXBvd2VybnYuYwo+ICsrKyBiL2RyaXZlcnMvaHdtb24vaWJtcG93ZXJudi5jCj4gQEAgLTE1NSwy
OCArMTU1LDIyIEBAIHN0YXRpYyBjb25zdCBjaGFyICpjb252ZXJ0X29wYWxfYXR0cl9uYW1lKGVu
dW0gc2Vuc29ycyB0eXBlLAo+ICAgICogd2hpY2ggbmVlZCB0byBiZSBtYXBwZWQgYXMgZmFuMl9p
bnB1dCwgdGVtcDFfbWF4IHJlc3BlY3RpdmVseSBiZWZvcmUKPiAgICAqIHBvcHVsYXRpbmcgdGhl
bSBpbnNpZGUgaHdtb24gZGV2aWNlIGNsYXNzLgo+ICAgICovCj4gLXN0YXRpYyBpbnQgY3JlYXRl
X2h3bW9uX2F0dHJfbmFtZShzdHJ1Y3QgZGV2aWNlICpkZXYsIGVudW0gc2Vuc29ycyB0eXBlLAo+
IC0JCQkJCSBjb25zdCBjaGFyICpub2RlX25hbWUsCj4gLQkJCQkJIGNoYXIgKmh3bW9uX2F0dHJf
bmFtZSkKPiArc3RhdGljIGludCBwYXJzZV9vcGFsX25vZGVfbmFtZShjb25zdCBjaGFyICpub2Rl
X25hbWUsIGVudW0gc2Vuc29ycyB0eXBlLAo+ICsJdTMyICppbmRleCwgY29uc3QgY2hhciAqKmh3
bW9uX2F0dHJfbmFtZSkKPiAgIHsKClBsZWFzZSBoYXZlIHRoZSBmdW5jdGlvbiByZXR1cm4gY29u
c3QgY2hhciAqIGFuZCBtZXJnZSB0aGUgZXJyb3IgY29kZSB3aXRoIEVSUl9QVFIuCgo+ICAgCWNo
YXIgYXR0cl9zdWZmaXhbTUFYX0FUVFJfTEVOXTsKPiAgIAljb25zdCBjaGFyICphdHRyX25hbWU7
Cj4gLQl1MzIgaW5kZXg7Cj4gICAJaW50IGVycjsKPgo+IC0JZXJyID0gZ2V0X3NlbnNvcl9pbmRl
eF9hdHRyKG5vZGVfbmFtZSwgJmluZGV4LCBhdHRyX3N1ZmZpeCk7Cj4gLQlpZiAoZXJyKSB7Cj4g
LQkJZGV2X2VycihkZXYsICJTZW5zb3IgZGV2aWNlIG5vZGUgbmFtZSAnJXMnIGlzIGludmFsaWRc
biIsCj4gLQkJCW5vZGVfbmFtZSk7Cj4gKwllcnIgPSBnZXRfc2Vuc29yX2luZGV4X2F0dHIobm9k
ZV9uYW1lLCBpbmRleCwgYXR0cl9zdWZmaXgpOwo+ICsJaWYgKGVycikKPiAgIAkJcmV0dXJuIGVy
cjsKPiAtCX0KPgo+ICAgCWF0dHJfbmFtZSA9IGNvbnZlcnRfb3BhbF9hdHRyX25hbWUodHlwZSwg
YXR0cl9zdWZmaXgpOwo+ICAgCWlmICghYXR0cl9uYW1lKQo+ICAgCQlyZXR1cm4gLUVOT0VOVDsK
Pgo+IC0Jc25wcmludGYoaHdtb25fYXR0cl9uYW1lLCBNQVhfQVRUUl9MRU4sICIlcyVkXyVzIiwK
PiAtCQkgc2Vuc29yX2dyb3Vwc1t0eXBlXS5uYW1lLCBpbmRleCwgYXR0cl9uYW1lKTsKPiArCSpo
d21vbl9hdHRyX25hbWUgPSBhdHRyX25hbWU7Cj4gICAJcmV0dXJuIDA7Cj4gICB9Cj4KPiBAQCAt
MjUyLDYgKzI0Niw5IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2RldmljZV9hdHRycyhzdHJ1Y3QgcGxh
dGZvcm1fZGV2aWNlICpwZGV2KQo+ICAgCX0KPgo+ICAgCWZvcl9lYWNoX2NoaWxkX29mX25vZGUo
b3BhbCwgbnApIHsKPiArCQljb25zdCBjaGFyICphdHRyX25hbWU7Cj4gKwkJdTMyIG9wYWxfaW5k
ZXg7Cj4gKwo+ICAgCQlpZiAobnAtPm5hbWUgPT0gTlVMTCkKPiAgIAkJCWNvbnRpbnVlOwo+Cj4g
QEAgLTI2OCwxMCArMjY1LDE3IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2RldmljZV9hdHRycyhzdHJ1
Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+Cj4gICAJCXNkYXRhW2NvdW50XS5pZCA9IHNlbnNv
cl9pZDsKPiAgIAkJc2RhdGFbY291bnRdLnR5cGUgPSB0eXBlOwo+IC0JCWVyciA9IGNyZWF0ZV9o
d21vbl9hdHRyX25hbWUoJnBkZXYtPmRldiwgdHlwZSwgbnAtPm5hbWUsCj4gLQkJCQkJICAgICBz
ZGF0YVtjb3VudF0ubmFtZSk7Cj4gLQkJaWYgKGVycikKPiArCj4gKwkJZXJyID0gcGFyc2Vfb3Bh
bF9ub2RlX25hbWUobnAtPm5hbWUsIHR5cGUsICZvcGFsX2luZGV4LAo+ICsJCQkJCSAgICZhdHRy
X25hbWUpOwo+ICsJCWlmIChlcnIpIHsKPiArCQkJZGV2X2VycigmcGRldi0+ZGV2LCAiU2Vuc29y
IGRldmljZSBub2RlIG5hbWUgJyVzJyBpcyBpbnZhbGlkXG4iLAo+ICsJCQkJbnAtPm5hbWUpOwo+
ICAgCQkJZ290byBleGl0X3B1dF9ub2RlOwo+ICsJCX0KPiArCj4gKwkJc25wcmludGYoc2RhdGFb
Y291bnRdLm5hbWUsIE1BWF9BVFRSX0xFTiwgIiVzJWRfJXMiLAo+ICsJCQkgc2Vuc29yX2dyb3Vw
c1t0eXBlXS5uYW1lLCBvcGFsX2luZGV4LCBhdHRyX25hbWUpOwo+Cj4gICAJCXN5c2ZzX2F0dHJf
aW5pdCgmc2RhdGFbY291bnRdLmRldl9hdHRyLmF0dHIpOwo+ICAgCQlzZGF0YVtjb3VudF0uZGV2
X2F0dHIuYXR0ci5uYW1lID0gc2RhdGFbY291bnRdLm5hbWU7Cj4KCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdAps
bS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWls
bWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux@roeck-us.net>
To: "Cédric Le Goater" <clg@fr.ibm.com>, lm-sensors@lm-sensors.org
Cc: Stewart Smith <stewart@linux.vnet.ibm.com>,
Neelesh Gupta <neelegup@linux.vnet.ibm.com>,
skiboot@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org,
Jean Delvare <jdelvare@suse.de>
Subject: Re: [PATCH 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype
Date: Wed, 18 Mar 2015 21:02:02 -0700 [thread overview]
Message-ID: <550A4A3A.3090406@roeck-us.net> (raw)
In-Reply-To: <1426693665-10797-5-git-send-email-clg@fr.ibm.com>
On 03/18/2015 08:47 AM, Cédric Le Goater wrote:
> 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)
> {
Please have the function return const char * and merge the error code with ERR_PTR.
> 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;
>
next prev parent reply other threads:[~2015-03-19 4:02 UTC|newest]
Thread overview: 96+ 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 ` [lm-sensors] [RFC PATCH 0/3] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-02-20 15:07 ` Cédric Le Goater
2015-02-20 16:52 ` [lm-sensors] " Guenter Roeck
2015-02-20 16:52 ` Guenter Roeck
2015-02-20 20:15 ` [lm-sensors] " Cedric Le Goater
2015-02-20 20:15 ` Cedric Le Goater
2015-02-20 23:52 ` [lm-sensors] " Guenter Roeck
2015-02-20 23:52 ` Guenter Roeck
2015-02-21 7:14 ` [lm-sensors] " Cedric Le Goater
2015-02-21 7:14 ` Cedric Le Goater
2015-02-21 11:03 ` [lm-sensors] " Guenter Roeck
2015-02-21 11:03 ` Guenter Roeck
2015-02-23 10:54 ` [lm-sensors] " Cedric Le Goater
2015-02-23 10:54 ` Cedric Le Goater
2015-02-20 15:07 ` [lm-sensors] [RFC PATCH 1/3] powerpc/powernv: Check OPAL sensor calls exist Cédric Le Goater
2015-02-20 15:07 ` Cédric Le Goater
2015-02-20 16:53 ` [lm-sensors] " Guenter Roeck
2015-02-20 16:53 ` Guenter Roeck
2015-02-20 20:18 ` [lm-sensors] " Cedric Le Goater
2015-02-20 20:18 ` Cedric Le Goater
2015-02-24 4:54 ` [lm-sensors] " Michael Ellerman
2015-02-24 4:54 ` Michael Ellerman
2015-02-25 17:28 ` [lm-sensors] " Cedric Le Goater
2015-02-25 17:28 ` Cedric Le Goater
2015-02-20 15:07 ` [lm-sensors] [RFC PATCH 2/3] powerpc/powernv: handle OPAL_SUCCESS return in opal_sensor_read Cédric Le Goater
2015-02-20 15:07 ` Cédric Le Goater
2015-02-20 15:07 ` [lm-sensors] [RFC PATCH 3/3] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-02-20 15:07 ` Cédric Le Goater
2015-03-18 15:47 ` [lm-sensors] [PATCH 0/5] hwmon: (ibmpowernv) remove dependency on OPAL index Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-19 4:05 ` [lm-sensors] " Guenter Roeck
2015-03-19 4:05 ` Guenter Roeck
2015-03-18 15:47 ` [lm-sensors] [PATCH 1/5] hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-18 15:47 ` [lm-sensors] [PATCH 2/5] hwmon: (ibmpowernv) add a get_sensor_type() routine Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-18 15:47 ` [lm-sensors] [PATCH 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-19 3:58 ` [lm-sensors] " Guenter Roeck
2015-03-19 3:58 ` Guenter Roeck
2015-03-18 15:47 ` [lm-sensors] [PATCH 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-19 4:02 ` Guenter Roeck [this message]
2015-03-19 4:02 ` Guenter Roeck
2015-03-18 15:47 ` [lm-sensors] [PATCH 5/5] hwmon: (ibmpowernv) do not use the OPAL index for hwmon attribute names Cédric Le Goater
2015-03-18 15:47 ` Cédric Le Goater
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 0/5] hwmon: (ibmpowernv) remove dependency on OPAL index Cédric Le Goater
2015-03-19 17:44 ` Cédric Le Goater
2015-03-20 15:26 ` [lm-sensors] " Guenter Roeck
2015-03-20 15:26 ` Guenter Roeck
2015-03-20 16:52 ` [lm-sensors] " Cedric Le Goater
2015-03-20 16:52 ` Cedric Le Goater
2015-04-01 10:15 ` [lm-sensors] [PATCH 0/4] hwmon: (ibmpowernv) add DTS support Cédric Le Goater
2015-04-01 10:15 ` Cédric Le Goater
2015-04-01 10:15 ` [lm-sensors] [PATCH 1/4] hwmon: (ibmpowernv) add a helper routine create_hwmon_attr Cédric Le Goater
2015-04-01 10:15 ` Cédric Le Goater
2015-04-01 10:15 ` [lm-sensors] [PATCH 2/4] hwmon: (ibmpowernv) add support for the new device tree Cédric Le Goater
2015-04-01 10:15 ` Cédric Le Goater
2015-04-08 15:20 ` [lm-sensors] " Guenter Roeck
2015-04-08 15:20 ` Guenter Roeck
2015-04-08 16:06 ` [lm-sensors] " Cedric Le Goater
2015-04-08 16:06 ` Cedric Le Goater
2015-04-01 10:15 ` [lm-sensors] [PATCH 3/4] hwmon: (ibmpowernv) add a label attribute Cédric Le Goater
2015-04-01 10:15 ` Cédric Le Goater
2015-04-01 10:15 ` [lm-sensors] [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels Cédric Le Goater
2015-04-01 10:15 ` Cédric Le Goater
2015-04-03 15:49 ` [lm-sensors] " Guenter Roeck
2015-04-03 15:49 ` Guenter Roeck
2015-04-07 14:42 ` [lm-sensors] " Cedric Le Goater
2015-04-07 14:42 ` Cedric Le Goater
2015-04-07 14:45 ` [lm-sensors] " Cédric Le Goater
2015-04-07 14:45 ` Cédric Le Goater
2015-04-07 16:44 ` [lm-sensors] " Guenter Roeck
2015-04-07 16:44 ` Guenter Roeck
2015-04-07 18:03 ` [lm-sensors] " Cedric Le Goater
2015-04-07 18:03 ` Cedric Le Goater
2015-04-07 19:22 ` [lm-sensors] " Guenter Roeck
2015-04-07 19:22 ` Guenter Roeck
2015-04-08 6:57 ` [lm-sensors] " Cedric Le Goater
2015-04-08 6:57 ` Cedric Le Goater
2015-04-07 20:22 ` [lm-sensors] [Skiboot] " Benjamin Herrenschmidt
2015-04-07 20:22 ` Benjamin Herrenschmidt
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 1/5] hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP Cédric Le Goater
2015-03-19 17:44 ` Cédric Le Goater
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 2/5] hwmon: (ibmpowernv) add a get_sensor_type() routine Cédric Le Goater
2015-03-19 17:44 ` Cédric Le Goater
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine Cédric Le Goater
2015-03-19 17:44 ` Cédric Le Goater
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 4/5] hwmon: (ibmpowernv) change create_hwmon_attr_name() prototype Cédric Le Goater
2015-03-19 17:44 ` Cédric Le Goater
2015-03-20 8:06 ` [lm-sensors] " Cedric Le Goater
2015-03-20 8:06 ` Cedric Le Goater
2015-03-20 15:27 ` [lm-sensors] " Guenter Roeck
2015-03-20 15:27 ` Guenter Roeck
2015-03-19 17:44 ` [lm-sensors] [PATCH v2 5/5] hwmon: (ibmpowernv) do not use the OPAL index for hwmon attribute names Cédric Le Goater
2015-03-19 17:44 ` 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=550A4A3A.3090406@roeck-us.net \
--to=linux@roeck-us.net \
--cc=clg@fr.ibm.com \
--cc=jdelvare@suse.de \
--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 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.