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 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine
Date: Thu, 19 Mar 2015 03:58:06 +0000 [thread overview]
Message-ID: <550A494E.2080103@roeck-us.net> (raw)
In-Reply-To: <1426693665-10797-4-git-send-email-clg@fr.ibm.com>
T24gMDMvMTgvMjAxNSAwODo0NyBBTSwgQ8OpZHJpYyBMZSBHb2F0ZXIgd3JvdGU6Cj4gSXQgc2lt
cGxpZmllcyB0aGUgY3JlYXRlX2h3bW9uX2F0dHJfbmFtZSgpIHJvdXRpbmUgYW5kIGl0IGNsZWFy
bHkgaXNvbGF0ZXMKPiB0aGUgY29udmVyc2lvbiBkb25lIGJldHdlZW4gdGhlIE9QQUwgbm9kZSBu
YW1lcyBhbmQgaHdtb24gYXR0cmlidXRlcyBuYW1lcy4KPgo+IFNpZ25lZC1vZmYtYnk6IEPDqWRy
aWMgTGUgR29hdGVyIDxjbGdAZnIuaWJtLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvaHdtb24vaWJt
cG93ZXJudi5jIHwgICAzOSArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0K
PiAgIDEgZmlsZSBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKPgo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYyBiL2RyaXZlcnMvaHdtb24v
aWJtcG93ZXJudi5jCj4gaW5kZXggMDdhODIxOWI3ZjRlLi5lZGNjNGZmYTVhZDAgMTAwNjQ0Cj4g
LS0tIGEvZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMKPiArKysgYi9kcml2ZXJzL2h3bW9uL2li
bXBvd2VybnYuYwo+IEBAIC0xMjcsNiArMTI3LDI4IEBAIHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9p
bmRleF9hdHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAqaW5kZXgsCj4gICAJcmV0dXJuIDA7Cj4g
ICB9Cj4KPiArc3RhdGljIGNvbnN0IGNoYXIgKmNvbnZlcnRfb3BhbF9hdHRyX25hbWUoZW51bSBz
ZW5zb3JzIHR5cGUsCj4gKwkJCQkJY29uc3QgY2hhciAqb3BhbF9hdHRyKQoKV291bGQgYmUgZ3Jl
YXQgaWYgeW91IGNvdWxkIGFsaWduIGFsbCB0aGUgY29udGludWF0aW9uIGxpbmVzIHdpdGggJygn
LgoKPiArewo+ICsJY29uc3QgY2hhciAqYXR0cl9uYW1lID0gTlVMTDsKPiArCj4gKwlpZiAoIXN0
cmNtcChvcGFsX2F0dHIsIERUX0ZBVUxUX0FUVFJfU1VGRklYKSkgewo+ICsJCWF0dHJfbmFtZSA9
ICJmYXVsdCI7Cj4gKwl9IGVsc2UgaWYgKCFzdHJjbXAob3BhbF9hdHRyLCBEVF9EQVRBX0FUVFJf
U1VGRklYKSkgewo+ICsJCWF0dHJfbmFtZSA9ICJpbnB1dCI7Cj4gKwl9IGVsc2UgaWYgKCFzdHJj
bXAob3BhbF9hdHRyLCBEVF9USFJFU0hPTERfQVRUUl9TVUZGSVgpKSB7Cj4gKwkJaWYgKHR5cGUg
PT0gVEVNUCkKPiArCQkJYXR0cl9uYW1lID0gIm1heCI7Cj4gKwkJZWxzZSBpZiAodHlwZSA9PSBG
QU4pCj4gKwkJCWF0dHJfbmFtZSA9ICJtaW4iOwo+ICsJCWVsc2UKPiArCQkJcmV0dXJuIE5VTEw7
Cj4gKwl9IGVsc2Ugewo+ICsJCXJldHVybiBOVUxMOwo+ICsJfQoKVGhvc2UgZWxzZSBjYXNlcyBy
ZXR1cm5pbmcgTlVMTCBhcmUgdW5uZWNlc3Nhcnk7IGF0dHJfbmFtZQppcyBhbHJlYWR5IGluaXRp
YWxpemVkIHdpdGggTlVMTCwgc28geW91IGNhbiBqdXN0IHJldHVybiBpdC4KCgo+ICsJcmV0dXJu
IGF0dHJfbmFtZTsKPiArfQo+ICsKPiAgIC8qCj4gICAgKiBUaGlzIGZ1bmN0aW9uIHRyYW5zbGF0
ZXMgdGhlIERUIG5vZGUgbmFtZSBpbnRvIHRoZSAnaHdtb24nIGF0dHJpYnV0ZSBuYW1lLgo+ICAg
ICogSUJNUE9XRVJOViBkZXZpY2Ugbm9kZSBhcHBlYXIgbGlrZSBjb29saW5nLWZhbiMyLWRhdGEs
IGFtYi10ZW1wIzEtdGhycyBldGMuCj4gQEAgLTEzOCw3ICsxNjAsNyBAQCBzdGF0aWMgaW50IGNy
ZWF0ZV9od21vbl9hdHRyX25hbWUoc3RydWN0IGRldmljZSAqZGV2LCBlbnVtIHNlbnNvcnMgdHlw
ZSwKPiAgIAkJCQkJIGNoYXIgKmh3bW9uX2F0dHJfbmFtZSkKPiAgIHsKPiAgIAljaGFyIGF0dHJf
c3VmZml4W01BWF9BVFRSX0xFTl07Cj4gLQljaGFyICphdHRyX25hbWU7Cj4gKwljb25zdCBjaGFy
ICphdHRyX25hbWU7Cj4gICAJdTMyIGluZGV4Owo+ICAgCWludCBlcnI7Cj4KPiBAQCAtMTQ5LDIw
ICsxNzEsOSBAQCBzdGF0aWMgaW50IGNyZWF0ZV9od21vbl9hdHRyX25hbWUoc3RydWN0IGRldmlj
ZSAqZGV2LCBlbnVtIHNlbnNvcnMgdHlwZSwKPiAgIAkJcmV0dXJuIGVycjsKPiAgIAl9Cj4KPiAt
CWlmICghc3RyY21wKGF0dHJfc3VmZml4LCBEVF9GQVVMVF9BVFRSX1NVRkZJWCkpIHsKPiAtCQlh
dHRyX25hbWUgPSAiZmF1bHQiOwo+IC0JfSBlbHNlIGlmICghc3RyY21wKGF0dHJfc3VmZml4LCBE
VF9EQVRBX0FUVFJfU1VGRklYKSkgewo+IC0JCWF0dHJfbmFtZSA9ICJpbnB1dCI7Cj4gLQl9IGVs
c2UgaWYgKCFzdHJjbXAoYXR0cl9zdWZmaXgsIERUX1RIUkVTSE9MRF9BVFRSX1NVRkZJWCkpIHsK
PiAtCQlpZiAodHlwZSA9PSBURU1QKQo+IC0JCQlhdHRyX25hbWUgPSAibWF4IjsKPiAtCQllbHNl
IGlmICh0eXBlID09IEZBTikKPiAtCQkJYXR0cl9uYW1lID0gIm1pbiI7Cj4gLQkJZWxzZQo+IC0J
CQlyZXR1cm4gLUVOT0VOVDsKPiAtCX0gZWxzZSB7Cj4gKwlhdHRyX25hbWUgPSBjb252ZXJ0X29w
YWxfYXR0cl9uYW1lKHR5cGUsIGF0dHJfc3VmZml4KTsKPiArCWlmICghYXR0cl9uYW1lKQo+ICAg
CQlyZXR1cm4gLUVOT0VOVDsKPiAtCX0KPgo+ICAgCXNucHJpbnRmKGh3bW9uX2F0dHJfbmFtZSwg
TUFYX0FUVFJfTEVOLCAiJXMlZF8lcyIsCj4gICAJCSBzZW5zb3JfZ3JvdXBzW3R5cGVdLm5hbWUs
IGluZGV4LCBhdHRyX25hbWUpOwo+CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QKbG0tc2Vuc29yc0BsbS1zZW5z
b3JzLm9yZwpodHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFpbG1hbi9saXN0aW5mby9sbS1z
ZW5zb3Jz
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 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine
Date: Wed, 18 Mar 2015 20:58:06 -0700 [thread overview]
Message-ID: <550A494E.2080103@roeck-us.net> (raw)
In-Reply-To: <1426693665-10797-4-git-send-email-clg@fr.ibm.com>
On 03/18/2015 08:47 AM, Cédric Le Goater wrote:
> It simplifies the create_hwmon_attr_name() routine and it clearly isolates
> the conversion done between the OPAL node names and hwmon attributes names.
>
> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
> ---
> drivers/hwmon/ibmpowernv.c | 39 +++++++++++++++++++++++++--------------
> 1 file changed, 25 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
> index 07a8219b7f4e..edcc4ffa5ad0 100644
> --- a/drivers/hwmon/ibmpowernv.c
> +++ b/drivers/hwmon/ibmpowernv.c
> @@ -127,6 +127,28 @@ static int get_sensor_index_attr(const char *name, u32 *index,
> return 0;
> }
>
> +static const char *convert_opal_attr_name(enum sensors type,
> + const char *opal_attr)
Would be great if you could align all the continuation lines with '('.
> +{
> + const char *attr_name = NULL;
> +
> + if (!strcmp(opal_attr, DT_FAULT_ATTR_SUFFIX)) {
> + attr_name = "fault";
> + } else if (!strcmp(opal_attr, DT_DATA_ATTR_SUFFIX)) {
> + attr_name = "input";
> + } else if (!strcmp(opal_attr, DT_THRESHOLD_ATTR_SUFFIX)) {
> + if (type == TEMP)
> + attr_name = "max";
> + else if (type == FAN)
> + attr_name = "min";
> + else
> + return NULL;
> + } else {
> + return NULL;
> + }
Those else cases returning NULL are unnecessary; attr_name
is already initialized with NULL, so you can just return it.
> + return attr_name;
> +}
> +
> /*
> * This function translates the DT node name into the 'hwmon' attribute name.
> * IBMPOWERNV device node appear like cooling-fan#2-data, amb-temp#1-thrs etc.
> @@ -138,7 +160,7 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type,
> char *hwmon_attr_name)
> {
> char attr_suffix[MAX_ATTR_LEN];
> - char *attr_name;
> + const char *attr_name;
> u32 index;
> int err;
>
> @@ -149,20 +171,9 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type,
> return err;
> }
>
> - if (!strcmp(attr_suffix, DT_FAULT_ATTR_SUFFIX)) {
> - attr_name = "fault";
> - } else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) {
> - attr_name = "input";
> - } else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) {
> - if (type == TEMP)
> - attr_name = "max";
> - else if (type == FAN)
> - attr_name = "min";
> - else
> - return -ENOENT;
> - } else {
> + 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);
>
next prev parent reply other threads:[~2015-03-19 3:58 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 ` Guenter Roeck [this message]
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 ` [lm-sensors] " Guenter Roeck
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=550A494E.2080103@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.