Skip to content

Commit e98dd53

Browse files
groeckgroeck
committed
hwmon: (aspeed-pwm-tacho) Use permission specific SENSOR[_DEVICE]_ATTR variants
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: Joel Stanley <joel@jms.id.au> Cc: Andrew Jeffery <andrew@aj.id.au> Tested-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent 71ee4a4 commit e98dd53

File tree

1 file changed

+28
-52
lines changed

1 file changed

+28
-52
lines changed

‎drivers/hwmon/aspeed-pwm-tacho.c

+28-52
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,8 @@ static int aspeed_get_fan_tach_ch_rpm(struct aspeed_pwm_tacho_data *priv,
570570
return (clk_source * 60) / (2 * raw_data * tach_div);
571571
}
572572

573-
static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
574-
const char *buf, size_t count)
573+
static ssize_t pwm_store(struct device *dev, struct device_attribute *attr,
574+
const char *buf, size_t count)
575575
{
576576
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
577577
int index = sensor_attr->index;
@@ -595,7 +595,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
595595
return count;
596596
}
597597

598-
static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
598+
static ssize_t pwm_show(struct device *dev, struct device_attribute *attr,
599599
char *buf)
600600
{
601601
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -605,7 +605,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
605605
return sprintf(buf, "%u\n", priv->pwm_port_fan_ctrl[index]);
606606
}
607607

608-
static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
608+
static ssize_t rpm_show(struct device *dev, struct device_attribute *attr,
609609
char *buf)
610610
{
611611
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
@@ -642,22 +642,14 @@ static umode_t fan_dev_is_visible(struct kobject *kobj,
642642
return a->mode;
643643
}
644644

645-
static SENSOR_DEVICE_ATTR(pwm1, 0644,
646-
show_pwm, set_pwm, 0);
647-
static SENSOR_DEVICE_ATTR(pwm2, 0644,
648-
show_pwm, set_pwm, 1);
649-
static SENSOR_DEVICE_ATTR(pwm3, 0644,
650-
show_pwm, set_pwm, 2);
651-
static SENSOR_DEVICE_ATTR(pwm4, 0644,
652-
show_pwm, set_pwm, 3);
653-
static SENSOR_DEVICE_ATTR(pwm5, 0644,
654-
show_pwm, set_pwm, 4);
655-
static SENSOR_DEVICE_ATTR(pwm6, 0644,
656-
show_pwm, set_pwm, 5);
657-
static SENSOR_DEVICE_ATTR(pwm7, 0644,
658-
show_pwm, set_pwm, 6);
659-
static SENSOR_DEVICE_ATTR(pwm8, 0644,
660-
show_pwm, set_pwm, 7);
645+
static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0);
646+
static SENSOR_DEVICE_ATTR_RW(pwm2, pwm, 1);
647+
static SENSOR_DEVICE_ATTR_RW(pwm3, pwm, 2);
648+
static SENSOR_DEVICE_ATTR_RW(pwm4, pwm, 3);
649+
static SENSOR_DEVICE_ATTR_RW(pwm5, pwm, 4);
650+
static SENSOR_DEVICE_ATTR_RW(pwm6, pwm, 5);
651+
static SENSOR_DEVICE_ATTR_RW(pwm7, pwm, 6);
652+
static SENSOR_DEVICE_ATTR_RW(pwm8, pwm, 7);
661653
static struct attribute *pwm_dev_attrs[] = {
662654
&sensor_dev_attr_pwm1.dev_attr.attr,
663655
&sensor_dev_attr_pwm2.dev_attr.attr,
@@ -675,38 +667,22 @@ static const struct attribute_group pwm_dev_group = {
675667
.is_visible = pwm_is_visible,
676668
};
677669

678-
static SENSOR_DEVICE_ATTR(fan1_input, 0444,
679-
show_rpm, NULL, 0);
680-
static SENSOR_DEVICE_ATTR(fan2_input, 0444,
681-
show_rpm, NULL, 1);
682-
static SENSOR_DEVICE_ATTR(fan3_input, 0444,
683-
show_rpm, NULL, 2);
684-
static SENSOR_DEVICE_ATTR(fan4_input, 0444,
685-
show_rpm, NULL, 3);
686-
static SENSOR_DEVICE_ATTR(fan5_input, 0444,
687-
show_rpm, NULL, 4);
688-
static SENSOR_DEVICE_ATTR(fan6_input, 0444,
689-
show_rpm, NULL, 5);
690-
static SENSOR_DEVICE_ATTR(fan7_input, 0444,
691-
show_rpm, NULL, 6);
692-
static SENSOR_DEVICE_ATTR(fan8_input, 0444,
693-
show_rpm, NULL, 7);
694-
static SENSOR_DEVICE_ATTR(fan9_input, 0444,
695-
show_rpm, NULL, 8);
696-
static SENSOR_DEVICE_ATTR(fan10_input, 0444,
697-
show_rpm, NULL, 9);
698-
static SENSOR_DEVICE_ATTR(fan11_input, 0444,
699-
show_rpm, NULL, 10);
700-
static SENSOR_DEVICE_ATTR(fan12_input, 0444,
701-
show_rpm, NULL, 11);
702-
static SENSOR_DEVICE_ATTR(fan13_input, 0444,
703-
show_rpm, NULL, 12);
704-
static SENSOR_DEVICE_ATTR(fan14_input, 0444,
705-
show_rpm, NULL, 13);
706-
static SENSOR_DEVICE_ATTR(fan15_input, 0444,
707-
show_rpm, NULL, 14);
708-
static SENSOR_DEVICE_ATTR(fan16_input, 0444,
709-
show_rpm, NULL, 15);
670+
static SENSOR_DEVICE_ATTR_RO(fan1_input, rpm, 0);
671+
static SENSOR_DEVICE_ATTR_RO(fan2_input, rpm, 1);
672+
static SENSOR_DEVICE_ATTR_RO(fan3_input, rpm, 2);
673+
static SENSOR_DEVICE_ATTR_RO(fan4_input, rpm, 3);
674+
static SENSOR_DEVICE_ATTR_RO(fan5_input, rpm, 4);
675+
static SENSOR_DEVICE_ATTR_RO(fan6_input, rpm, 5);
676+
static SENSOR_DEVICE_ATTR_RO(fan7_input, rpm, 6);
677+
static SENSOR_DEVICE_ATTR_RO(fan8_input, rpm, 7);
678+
static SENSOR_DEVICE_ATTR_RO(fan9_input, rpm, 8);
679+
static SENSOR_DEVICE_ATTR_RO(fan10_input, rpm, 9);
680+
static SENSOR_DEVICE_ATTR_RO(fan11_input, rpm, 10);
681+
static SENSOR_DEVICE_ATTR_RO(fan12_input, rpm, 11);
682+
static SENSOR_DEVICE_ATTR_RO(fan13_input, rpm, 12);
683+
static SENSOR_DEVICE_ATTR_RO(fan14_input, rpm, 13);
684+
static SENSOR_DEVICE_ATTR_RO(fan15_input, rpm, 14);
685+
static SENSOR_DEVICE_ATTR_RO(fan16_input, rpm, 15);
710686
static struct attribute *fan_dev_attrs[] = {
711687
&sensor_dev_attr_fan1_input.dev_attr.attr,
712688
&sensor_dev_attr_fan2_input.dev_attr.attr,

0 commit comments

Comments
 (0)