Skip to contentSkip to conversation

hwmon: (pmbus_core) Replace S_<PERMS> with octal values

PATCH In review Guenter Roeck 2 participants 3 messages Apr 14, 2019 – Apr 15, 2019 Hardware monitoring

lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

PATCH 1/1 hwmon: (pmbus_core) Replace S_<PERMS> with octal values

Replace S_<PERMS> with octal values.

The conversion was done automatically with coccinelle. The semantic patches and the scripts used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches/hwmon/.

This patch does not introduce functional changes. It was verified by compiling the old and new files and comparing text and data sizes.

Cc Krzysztof Adamski <[email protected]>
---
 drivers/hwmon/pmbus/pmbus_core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +3 -3
index 2e2b5851139c..e2366428a9a9 100644
@@ -1073,7 +1073,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
 		 name, seq, type);
 	boolean->s1 = s1;
 	boolean->s2 = s2;
-	pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL,
+	pmbus_attr_init(a, boolean->name, 0444, pmbus_show_boolean, NULL,
 			(reg << 16) | mask);
 
 	return pmbus_add_attribute(data, &a->dev_attr.attr);
@@ -1107,7 +1107,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
 	sensor->update = update;
 	sensor->convert = convert;
 	pmbus_dev_attr_init(a, sensor->name,
-			    readonly ? S_IRUGO : S_IRUGO | S_IWUSR,
+			    readonly ? 0444 : 0644,
 			    pmbus_show_sensor, pmbus_set_sensor);
 
 	if (pmbus_add_attribute(data, &a->attr))
@@ -1139,7 +1139,7 @@ static int pmbus_add_label(struct pmbus_data *data,
 		snprintf(label->label, sizeof(label->label), "%s%d", lstring,
 			 index);
 
-	pmbus_dev_attr_init(a, label->name, S_IRUGO, pmbus_show_label, NULL);
+	pmbus_dev_attr_init(a, label->name, 0444, pmbus_show_label, NULL);
 	return pmbus_add_attribute(data, &a->attr);
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 5 lines · Guenter Roeck

Replace S_<PERMS> with octal values.

The conversion was done automatically with coccinelle. The semantic patches and the scripts used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches/hwmon/.

The URL is 404. blob/master/hwmon instead of just hwmon at the end would work.

Quoted 2 lines

This patch does not introduce functional changes. It was verified by compiling the old and new files and comparing text and data sizes.

I don't think that the sizes would change even if there was some error introuced if it still compiles. But of course both the conccinele script is ok and I manually verified the patch. Also, git grep "\bS_" pmbus* does not return anything meaning all the places were converted.

Quoted 40 lines
Cc Krzysztof Adamski <[email protected]>

---
drivers/hwmon/pmbus/pmbus_core.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +3 -3
index 2e2b5851139c..e2366428a9a9 100644
@@ -1073,7 +1073,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
 		 name, seq, type);
 	boolean->s1 = s1;
 	boolean->s2 = s2;
-	pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL,
+	pmbus_attr_init(a, boolean->name, 0444, pmbus_show_boolean, NULL,
 			(reg << 16) | mask);
 
 	return pmbus_add_attribute(data, &a->dev_attr.attr);
@@ -1107,7 +1107,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
 	sensor->update = update;
 	sensor->convert = convert;
 	pmbus_dev_attr_init(a, sensor->name,
-			    readonly ? S_IRUGO : S_IRUGO | S_IWUSR,
+			    readonly ? 0444 : 0644,
 			    pmbus_show_sensor, pmbus_set_sensor);
 
 	if (pmbus_add_attribute(data, &a->attr))
@@ -1139,7 +1139,7 @@ static int pmbus_add_label(struct pmbus_data *data,
 		snprintf(label->label, sizeof(label->label), "%s%d", lstring,
 			 index);
 
-	pmbus_dev_attr_init(a, label->name, S_IRUGO, pmbus_show_label, NULL);
+	pmbus_dev_attr_init(a, label->name, 0444, pmbus_show_label, NULL);
 	return pmbus_add_attribute(data, &a->attr);
 }
 
Signature · 1 line
2.7.4

Krzysztof

author maintainer
#2 lore raw
Quoted 10 lines · Krzysztof (Nokia - PL/Wroclaw)
Quoted 5 lines · Guenter Roeck

Replace S_<PERMS> with octal values.

The conversion was done automatically with coccinelle. The semantic patches and the scripts used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches/hwmon/.

The URL is 404. blob/master/hwmon instead of just hwmon at the end would work.

Thanks for noticing. Looks like github changed references since I wrote the automated scripts. Oh well. I'll drop the hwmon part from all similar patches.

Quoted 8 lines
Quoted 2 lines

This patch does not introduce functional changes. It was verified by compiling the old and new files and comparing text and data sizes.

I don't think that the sizes would change even if there was some error introuced if it still compiles. But of course both the conccinele script is ok and I manually verified the patch. Also, git grep "\bS_" pmbus* does not return anything meaning all the places were converted.

It may not catch all cases, that is correct, but it does help.

Guenter

Quoted 43 lines
Quoted 40 lines
Cc Krzysztof Adamski <[email protected]>

---
drivers/hwmon/pmbus/pmbus_core.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +3 -3
index 2e2b5851139c..e2366428a9a9 100644
@@ -1073,7 +1073,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
 		 name, seq, type);
 	boolean->s1 = s1;
 	boolean->s2 = s2;
-	pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL,
+	pmbus_attr_init(a, boolean->name, 0444, pmbus_show_boolean, NULL,
 			(reg << 16) | mask);
 
 	return pmbus_add_attribute(data, &a->dev_attr.attr);
@@ -1107,7 +1107,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
 	sensor->update = update;
 	sensor->convert = convert;
 	pmbus_dev_attr_init(a, sensor->name,
-			    readonly ? S_IRUGO : S_IRUGO | S_IWUSR,
+			    readonly ? 0444 : 0644,
 			    pmbus_show_sensor, pmbus_set_sensor);
 
 	if (pmbus_add_attribute(data, &a->attr))
@@ -1139,7 +1139,7 @@ static int pmbus_add_label(struct pmbus_data *data,
 		snprintf(label->label, sizeof(label->label), "%s%d", lstring,
 			 index);
 
-	pmbus_dev_attr_init(a, label->name, S_IRUGO, pmbus_show_label, NULL);
+	pmbus_dev_attr_init(a, label->name, 0444, pmbus_show_label, NULL);
 	return pmbus_add_attribute(data, &a->attr);
 }
 
Signature · 1 line
2.7.4

Krzysztof