On Fri, Jan 18, 2019 at 09:14:59AM -0800, Guenter Roeck wrote:
> Use SENSOR[_DEVICE]_ATTR[_2]_{RO,RW,WO} to simplify the source code,
> to improve readbility, 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.
>
> Cc: Liviu Dudau <[email protected]>
> Cc: Sudeep Holla <[email protected]>
> Cc: Lorenzo Pieralisi <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
Acked-by: Liviu Dudau <[email protected]>
Are you going to take the patch via your tree?
Best regards,
Liviu
> ---
> drivers/hwmon/vexpress-hwmon.c | 25 ++++++++++---------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/hwmon/vexpress-hwmon.c b/drivers/hwmon/vexpress-hwmon.c
> index 8ba419d343f8..0b84adb5e88e 100644
> --- a/drivers/hwmon/vexpress-hwmon.c
> +++ b/drivers/hwmon/vexpress-hwmon.c
> @@ -92,9 +92,8 @@ struct vexpress_hwmon_type {
> };
>
> #if !defined(CONFIG_REGULATOR_VEXPRESS)
> -static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);
> -static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show,
> - NULL, 1000);
> +static DEVICE_ATTR(in1_label, 0444, vexpress_hwmon_label_show, NULL);
> +static SENSOR_DEVICE_ATTR_RO(in1_input, vexpress_hwmon_u32, 1000);
> static struct attribute *vexpress_hwmon_attrs_volt[] = {
> &dev_attr_in1_label.attr,
> &sensor_dev_attr_in1_input.dev_attr.attr,
> @@ -113,9 +112,8 @@ static struct vexpress_hwmon_type vexpress_hwmon_volt = {
> };
> #endif
>
> -static DEVICE_ATTR(curr1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);
> -static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, vexpress_hwmon_u32_show,
> - NULL, 1000);
> +static DEVICE_ATTR(curr1_label, 0444, vexpress_hwmon_label_show, NULL);
> +static SENSOR_DEVICE_ATTR_RO(curr1_input, vexpress_hwmon_u32, 1000);
> static struct attribute *vexpress_hwmon_attrs_amp[] = {
> &dev_attr_curr1_label.attr,
> &sensor_dev_attr_curr1_input.dev_attr.attr,
> @@ -133,9 +131,8 @@ static struct vexpress_hwmon_type vexpress_hwmon_amp = {
> },
> };
>
> -static DEVICE_ATTR(temp1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);
> -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, vexpress_hwmon_u32_show,
> - NULL, 1000);
> +static DEVICE_ATTR(temp1_label, 0444, vexpress_hwmon_label_show, NULL);
> +static SENSOR_DEVICE_ATTR_RO(temp1_input, vexpress_hwmon_u32, 1000);
> static struct attribute *vexpress_hwmon_attrs_temp[] = {
> &dev_attr_temp1_label.attr,
> &sensor_dev_attr_temp1_input.dev_attr.attr,
> @@ -153,9 +150,8 @@ static struct vexpress_hwmon_type vexpress_hwmon_temp = {
> },
> };
>
> -static DEVICE_ATTR(power1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);
> -static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, vexpress_hwmon_u32_show,
> - NULL, 1);
> +static DEVICE_ATTR(power1_label, 0444, vexpress_hwmon_label_show, NULL);
> +static SENSOR_DEVICE_ATTR_RO(power1_input, vexpress_hwmon_u32, 1);
> static struct attribute *vexpress_hwmon_attrs_power[] = {
> &dev_attr_power1_label.attr,
> &sensor_dev_attr_power1_input.dev_attr.attr,
> @@ -173,9 +169,8 @@ static struct vexpress_hwmon_type vexpress_hwmon_power = {
> },
> };
>
> -static DEVICE_ATTR(energy1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);
> -static SENSOR_DEVICE_ATTR(energy1_input, S_IRUGO, vexpress_hwmon_u64_show,
> - NULL, 1);
> +static DEVICE_ATTR(energy1_label, 0444, vexpress_hwmon_label_show, NULL);
> +static SENSOR_DEVICE_ATTR_RO(energy1_input, vexpress_hwmon_u64, 1);
> static struct attribute *vexpress_hwmon_attrs_energy[] = {
> &dev_attr_energy1_label.attr,
> &sensor_dev_attr_energy1_input.dev_attr.attr,
> --
> 2.7.4
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
