diff for duplicates of <550A494E.2080103@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index c8b5602..bb672a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,49 +1,83 @@ -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 +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); +> diff --git a/a/content_digest b/N1/content_digest index 854a94a..1486cdc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01423117857-32759-1-git-send-email-clg@fr.ibm.com\0" "ref\01426693665-10797-4-git-send-email-clg@fr.ibm.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [lm-sensors] [PATCH 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine\0" - "Date\0Thu, 19 Mar 2015 03:58:06 +0000\0" + "Subject\0Re: [PATCH 3/5] hwmon: (ibmpowernv) add a convert_opal_attr_name() routine\0" + "Date\0Wed, 18 Mar 2015 20:58:06 -0700\0" "To\0C\303\251dric Le Goater <clg@fr.ibm.com>" " lm-sensors@lm-sensors.org\0" "Cc\0Stewart Smith <stewart@linux.vnet.ibm.com>" @@ -12,54 +12,88 @@ " Jean Delvare <jdelvare@suse.de>\0" "\00:1\0" "b\0" - "T24gMDMvMTgvMjAxNSAwODo0NyBBTSwgQ8OpZHJpYyBMZSBHb2F0ZXIgd3JvdGU6Cj4gSXQgc2lt\n" - "cGxpZmllcyB0aGUgY3JlYXRlX2h3bW9uX2F0dHJfbmFtZSgpIHJvdXRpbmUgYW5kIGl0IGNsZWFy\n" - "bHkgaXNvbGF0ZXMKPiB0aGUgY29udmVyc2lvbiBkb25lIGJldHdlZW4gdGhlIE9QQUwgbm9kZSBu\n" - "YW1lcyBhbmQgaHdtb24gYXR0cmlidXRlcyBuYW1lcy4KPgo+IFNpZ25lZC1vZmYtYnk6IEPDqWRy\n" - "aWMgTGUgR29hdGVyIDxjbGdAZnIuaWJtLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvaHdtb24vaWJt\n" - "cG93ZXJudi5jIHwgICAzOSArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0K\n" - "PiAgIDEgZmlsZSBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKPgo+\n" - "IGRpZmYgLS1naXQgYS9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYyBiL2RyaXZlcnMvaHdtb24v\n" - "aWJtcG93ZXJudi5jCj4gaW5kZXggMDdhODIxOWI3ZjRlLi5lZGNjNGZmYTVhZDAgMTAwNjQ0Cj4g\n" - "LS0tIGEvZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMKPiArKysgYi9kcml2ZXJzL2h3bW9uL2li\n" - "bXBvd2VybnYuYwo+IEBAIC0xMjcsNiArMTI3LDI4IEBAIHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9p\n" - "bmRleF9hdHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAqaW5kZXgsCj4gICAJcmV0dXJuIDA7Cj4g\n" - "ICB9Cj4KPiArc3RhdGljIGNvbnN0IGNoYXIgKmNvbnZlcnRfb3BhbF9hdHRyX25hbWUoZW51bSBz\n" - "ZW5zb3JzIHR5cGUsCj4gKwkJCQkJY29uc3QgY2hhciAqb3BhbF9hdHRyKQoKV291bGQgYmUgZ3Jl\n" - "YXQgaWYgeW91IGNvdWxkIGFsaWduIGFsbCB0aGUgY29udGludWF0aW9uIGxpbmVzIHdpdGggJygn\n" - "LgoKPiArewo+ICsJY29uc3QgY2hhciAqYXR0cl9uYW1lID0gTlVMTDsKPiArCj4gKwlpZiAoIXN0\n" - "cmNtcChvcGFsX2F0dHIsIERUX0ZBVUxUX0FUVFJfU1VGRklYKSkgewo+ICsJCWF0dHJfbmFtZSA9\n" - "ICJmYXVsdCI7Cj4gKwl9IGVsc2UgaWYgKCFzdHJjbXAob3BhbF9hdHRyLCBEVF9EQVRBX0FUVFJf\n" - "U1VGRklYKSkgewo+ICsJCWF0dHJfbmFtZSA9ICJpbnB1dCI7Cj4gKwl9IGVsc2UgaWYgKCFzdHJj\n" - "bXAob3BhbF9hdHRyLCBEVF9USFJFU0hPTERfQVRUUl9TVUZGSVgpKSB7Cj4gKwkJaWYgKHR5cGUg\n" - "PT0gVEVNUCkKPiArCQkJYXR0cl9uYW1lID0gIm1heCI7Cj4gKwkJZWxzZSBpZiAodHlwZSA9PSBG\n" - "QU4pCj4gKwkJCWF0dHJfbmFtZSA9ICJtaW4iOwo+ICsJCWVsc2UKPiArCQkJcmV0dXJuIE5VTEw7\n" - "Cj4gKwl9IGVsc2Ugewo+ICsJCXJldHVybiBOVUxMOwo+ICsJfQoKVGhvc2UgZWxzZSBjYXNlcyBy\n" - "ZXR1cm5pbmcgTlVMTCBhcmUgdW5uZWNlc3Nhcnk7IGF0dHJfbmFtZQppcyBhbHJlYWR5IGluaXRp\n" - "YWxpemVkIHdpdGggTlVMTCwgc28geW91IGNhbiBqdXN0IHJldHVybiBpdC4KCgo+ICsJcmV0dXJu\n" - "IGF0dHJfbmFtZTsKPiArfQo+ICsKPiAgIC8qCj4gICAgKiBUaGlzIGZ1bmN0aW9uIHRyYW5zbGF0\n" - "ZXMgdGhlIERUIG5vZGUgbmFtZSBpbnRvIHRoZSAnaHdtb24nIGF0dHJpYnV0ZSBuYW1lLgo+ICAg\n" - "ICogSUJNUE9XRVJOViBkZXZpY2Ugbm9kZSBhcHBlYXIgbGlrZSBjb29saW5nLWZhbiMyLWRhdGEs\n" - "IGFtYi10ZW1wIzEtdGhycyBldGMuCj4gQEAgLTEzOCw3ICsxNjAsNyBAQCBzdGF0aWMgaW50IGNy\n" - "ZWF0ZV9od21vbl9hdHRyX25hbWUoc3RydWN0IGRldmljZSAqZGV2LCBlbnVtIHNlbnNvcnMgdHlw\n" - "ZSwKPiAgIAkJCQkJIGNoYXIgKmh3bW9uX2F0dHJfbmFtZSkKPiAgIHsKPiAgIAljaGFyIGF0dHJf\n" - "c3VmZml4W01BWF9BVFRSX0xFTl07Cj4gLQljaGFyICphdHRyX25hbWU7Cj4gKwljb25zdCBjaGFy\n" - "ICphdHRyX25hbWU7Cj4gICAJdTMyIGluZGV4Owo+ICAgCWludCBlcnI7Cj4KPiBAQCAtMTQ5LDIw\n" - "ICsxNzEsOSBAQCBzdGF0aWMgaW50IGNyZWF0ZV9od21vbl9hdHRyX25hbWUoc3RydWN0IGRldmlj\n" - "ZSAqZGV2LCBlbnVtIHNlbnNvcnMgdHlwZSwKPiAgIAkJcmV0dXJuIGVycjsKPiAgIAl9Cj4KPiAt\n" - "CWlmICghc3RyY21wKGF0dHJfc3VmZml4LCBEVF9GQVVMVF9BVFRSX1NVRkZJWCkpIHsKPiAtCQlh\n" - "dHRyX25hbWUgPSAiZmF1bHQiOwo+IC0JfSBlbHNlIGlmICghc3RyY21wKGF0dHJfc3VmZml4LCBE\n" - "VF9EQVRBX0FUVFJfU1VGRklYKSkgewo+IC0JCWF0dHJfbmFtZSA9ICJpbnB1dCI7Cj4gLQl9IGVs\n" - "c2UgaWYgKCFzdHJjbXAoYXR0cl9zdWZmaXgsIERUX1RIUkVTSE9MRF9BVFRSX1NVRkZJWCkpIHsK\n" - "PiAtCQlpZiAodHlwZSA9PSBURU1QKQo+IC0JCQlhdHRyX25hbWUgPSAibWF4IjsKPiAtCQllbHNl\n" - "IGlmICh0eXBlID09IEZBTikKPiAtCQkJYXR0cl9uYW1lID0gIm1pbiI7Cj4gLQkJZWxzZQo+IC0J\n" - "CQlyZXR1cm4gLUVOT0VOVDsKPiAtCX0gZWxzZSB7Cj4gKwlhdHRyX25hbWUgPSBjb252ZXJ0X29w\n" - "YWxfYXR0cl9uYW1lKHR5cGUsIGF0dHJfc3VmZml4KTsKPiArCWlmICghYXR0cl9uYW1lKQo+ICAg\n" - "CQlyZXR1cm4gLUVOT0VOVDsKPiAtCX0KPgo+ICAgCXNucHJpbnRmKGh3bW9uX2F0dHJfbmFtZSwg\n" - "TUFYX0FUVFJfTEVOLCAiJXMlZF8lcyIsCj4gICAJCSBzZW5zb3JfZ3JvdXBzW3R5cGVdLm5hbWUs\n" - "IGluZGV4LCBhdHRyX25hbWUpOwo+CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QKbG0tc2Vuc29yc0BsbS1zZW5z\n" - "b3JzLm9yZwpodHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFpbG1hbi9saXN0aW5mby9sbS1z\n" - ZW5zb3Jz + "On 03/18/2015 08:47 AM, C\303\251dric Le Goater wrote:\n" + "> It simplifies the create_hwmon_attr_name() routine and it clearly isolates\n" + "> the conversion done between the OPAL node names and hwmon attributes names.\n" + ">\n" + "> Signed-off-by: C\303\251dric Le Goater <clg@fr.ibm.com>\n" + "> ---\n" + "> drivers/hwmon/ibmpowernv.c | 39 +++++++++++++++++++++++++--------------\n" + "> 1 file changed, 25 insertions(+), 14 deletions(-)\n" + ">\n" + "> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c\n" + "> index 07a8219b7f4e..edcc4ffa5ad0 100644\n" + "> --- a/drivers/hwmon/ibmpowernv.c\n" + "> +++ b/drivers/hwmon/ibmpowernv.c\n" + "> @@ -127,6 +127,28 @@ static int get_sensor_index_attr(const char *name, u32 *index,\n" + "> \treturn 0;\n" + "> }\n" + ">\n" + "> +static const char *convert_opal_attr_name(enum sensors type,\n" + "> +\t\t\t\t\tconst char *opal_attr)\n" + "\n" + "Would be great if you could align all the continuation lines with '('.\n" + "\n" + "> +{\n" + "> +\tconst char *attr_name = NULL;\n" + "> +\n" + "> +\tif (!strcmp(opal_attr, DT_FAULT_ATTR_SUFFIX)) {\n" + "> +\t\tattr_name = \"fault\";\n" + "> +\t} else if (!strcmp(opal_attr, DT_DATA_ATTR_SUFFIX)) {\n" + "> +\t\tattr_name = \"input\";\n" + "> +\t} else if (!strcmp(opal_attr, DT_THRESHOLD_ATTR_SUFFIX)) {\n" + "> +\t\tif (type == TEMP)\n" + "> +\t\t\tattr_name = \"max\";\n" + "> +\t\telse if (type == FAN)\n" + "> +\t\t\tattr_name = \"min\";\n" + "> +\t\telse\n" + "> +\t\t\treturn NULL;\n" + "> +\t} else {\n" + "> +\t\treturn NULL;\n" + "> +\t}\n" + "\n" + "Those else cases returning NULL are unnecessary; attr_name\n" + "is already initialized with NULL, so you can just return it.\n" + "\n" + "\n" + "> +\treturn attr_name;\n" + "> +}\n" + "> +\n" + "> /*\n" + "> * This function translates the DT node name into the 'hwmon' attribute name.\n" + "> * IBMPOWERNV device node appear like cooling-fan#2-data, amb-temp#1-thrs etc.\n" + "> @@ -138,7 +160,7 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type,\n" + "> \t\t\t\t\t char *hwmon_attr_name)\n" + "> {\n" + "> \tchar attr_suffix[MAX_ATTR_LEN];\n" + "> -\tchar *attr_name;\n" + "> +\tconst char *attr_name;\n" + "> \tu32 index;\n" + "> \tint err;\n" + ">\n" + "> @@ -149,20 +171,9 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type,\n" + "> \t\treturn err;\n" + "> \t}\n" + ">\n" + "> -\tif (!strcmp(attr_suffix, DT_FAULT_ATTR_SUFFIX)) {\n" + "> -\t\tattr_name = \"fault\";\n" + "> -\t} else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) {\n" + "> -\t\tattr_name = \"input\";\n" + "> -\t} else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) {\n" + "> -\t\tif (type == TEMP)\n" + "> -\t\t\tattr_name = \"max\";\n" + "> -\t\telse if (type == FAN)\n" + "> -\t\t\tattr_name = \"min\";\n" + "> -\t\telse\n" + "> -\t\t\treturn -ENOENT;\n" + "> -\t} else {\n" + "> +\tattr_name = convert_opal_attr_name(type, attr_suffix);\n" + "> +\tif (!attr_name)\n" + "> \t\treturn -ENOENT;\n" + "> -\t}\n" + ">\n" + "> \tsnprintf(hwmon_attr_name, MAX_ATTR_LEN, \"%s%d_%s\",\n" + "> \t\t sensor_groups[type].name, index, attr_name);\n" + > -dd38562c3214d44033260ce31d52a0e4c078401eb7a2d5ad6d1cc73a58601e00 +f41e3ea987937ab221650da6cb3127252aca6247d3b98bcc087f8352d88acd75
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.