Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Guenter Roeck <linux@roeck-us.net>

+7 -8
+7 -8
drivers/hwmon/via-cputemp.c
··· 60 60 * Sysfs stuff 61 61 */ 62 62 63 - static ssize_t show_name(struct device *dev, struct device_attribute 64 - *devattr, char *buf) 63 + static ssize_t name_show(struct device *dev, struct device_attribute *devattr, 64 + char *buf) 65 65 { 66 66 int ret; 67 67 struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); ··· 74 74 return ret; 75 75 } 76 76 77 - static ssize_t show_temp(struct device *dev, 78 - struct device_attribute *devattr, char *buf) 77 + static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, 78 + char *buf) 79 79 { 80 80 struct via_cputemp_data *data = dev_get_drvdata(dev); 81 81 u32 eax, edx; ··· 102 102 return sprintf(buf, "%d\n", vid_from_reg(~edx & 0x7f, data->vrm)); 103 103 } 104 104 105 - static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 106 - SHOW_TEMP); 107 - static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL); 108 - static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME); 105 + static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, SHOW_TEMP); 106 + static SENSOR_DEVICE_ATTR_RO(temp1_label, name, SHOW_LABEL); 107 + static SENSOR_DEVICE_ATTR_RO(name, name, SHOW_NAME); 109 108 110 109 static struct attribute *via_cputemp_attributes[] = { 111 110 &sensor_dev_attr_name.dev_attr.attr,