Commit f74c24f8 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (via-cputemp) Use permission specific SENSOR[_DEVICE]_ATTR variants

Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
to improve readability, and to reduce the chance of inconsistencies.

Also replace any remaining S_<PERMS> in the driver 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.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent fa75f745
...@@ -60,8 +60,8 @@ struct via_cputemp_data { ...@@ -60,8 +60,8 @@ struct via_cputemp_data {
* Sysfs stuff * Sysfs stuff
*/ */
static ssize_t show_name(struct device *dev, struct device_attribute static ssize_t name_show(struct device *dev, struct device_attribute *devattr,
*devattr, char *buf) char *buf)
{ {
int ret; int ret;
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
...@@ -74,8 +74,8 @@ static ssize_t show_name(struct device *dev, struct device_attribute ...@@ -74,8 +74,8 @@ static ssize_t show_name(struct device *dev, struct device_attribute
return ret; return ret;
} }
static ssize_t show_temp(struct device *dev, static ssize_t temp_show(struct device *dev, struct device_attribute *devattr,
struct device_attribute *devattr, char *buf) char *buf)
{ {
struct via_cputemp_data *data = dev_get_drvdata(dev); struct via_cputemp_data *data = dev_get_drvdata(dev);
u32 eax, edx; u32 eax, edx;
...@@ -102,10 +102,9 @@ static ssize_t cpu0_vid_show(struct device *dev, ...@@ -102,10 +102,9 @@ static ssize_t cpu0_vid_show(struct device *dev,
return sprintf(buf, "%d\n", vid_from_reg(~edx & 0x7f, data->vrm)); return sprintf(buf, "%d\n", vid_from_reg(~edx & 0x7f, data->vrm));
} }
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, SHOW_TEMP);
SHOW_TEMP); static SENSOR_DEVICE_ATTR_RO(temp1_label, name, SHOW_LABEL);
static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL); static SENSOR_DEVICE_ATTR_RO(name, name, SHOW_NAME);
static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME);
static struct attribute *via_cputemp_attributes[] = { static struct attribute *via_cputemp_attributes[] = {
&sensor_dev_attr_name.dev_attr.attr, &sensor_dev_attr_name.dev_attr.attr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment