Commit c490c63e authored by Julia Lawall's avatar Julia Lawall Committed by Guenter Roeck

hwmon: (gpio-fan) use permission-specific DEVICE_ATTR variants

Use DEVICE_ATTR_RO for read only attributes and DEVICE_ATTR_RW for
read/write attributes. This simplifies the source code, improves
readbility, and reduces the chance of inconsistencies.

The conversion was done automatically using coccinelle. It was validated
by compiling both the old and the new source code and comparing its text,
data, and bss size.
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
[groeck: Updated description]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 2579b7ff
...@@ -77,8 +77,8 @@ static irqreturn_t fan_alarm_irq_handler(int irq, void *dev_id) ...@@ -77,8 +77,8 @@ static irqreturn_t fan_alarm_irq_handler(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
static ssize_t show_fan_alarm(struct device *dev, static ssize_t fan1_alarm_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
struct gpio_fan_alarm *alarm = fan_data->alarm; struct gpio_fan_alarm *alarm = fan_data->alarm;
...@@ -90,7 +90,7 @@ static ssize_t show_fan_alarm(struct device *dev, ...@@ -90,7 +90,7 @@ static ssize_t show_fan_alarm(struct device *dev,
return sprintf(buf, "%d\n", value); return sprintf(buf, "%d\n", value);
} }
static DEVICE_ATTR(fan1_alarm, S_IRUGO, show_fan_alarm, NULL); static DEVICE_ATTR_RO(fan1_alarm);
static int fan_alarm_init(struct gpio_fan_data *fan_data, static int fan_alarm_init(struct gpio_fan_data *fan_data,
struct gpio_fan_alarm *alarm) struct gpio_fan_alarm *alarm)
...@@ -188,8 +188,8 @@ static int rpm_to_speed_index(struct gpio_fan_data *fan_data, unsigned long rpm) ...@@ -188,8 +188,8 @@ static int rpm_to_speed_index(struct gpio_fan_data *fan_data, unsigned long rpm)
return fan_data->num_speed - 1; return fan_data->num_speed - 1;
} }
static ssize_t show_pwm(struct device *dev, static ssize_t pwm1_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
u8 pwm = fan_data->speed_index * 255 / (fan_data->num_speed - 1); u8 pwm = fan_data->speed_index * 255 / (fan_data->num_speed - 1);
...@@ -197,8 +197,8 @@ static ssize_t show_pwm(struct device *dev, ...@@ -197,8 +197,8 @@ static ssize_t show_pwm(struct device *dev,
return sprintf(buf, "%d\n", pwm); return sprintf(buf, "%d\n", pwm);
} }
static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, static ssize_t pwm1_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
unsigned long pwm; unsigned long pwm;
...@@ -224,16 +224,17 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, ...@@ -224,16 +224,17 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
return ret; return ret;
} }
static ssize_t show_pwm_enable(struct device *dev, static ssize_t pwm1_enable_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", fan_data->pwm_enable); return sprintf(buf, "%d\n", fan_data->pwm_enable);
} }
static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, static ssize_t pwm1_enable_store(struct device *dev,
const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
unsigned long val; unsigned long val;
...@@ -257,22 +258,22 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, ...@@ -257,22 +258,22 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
return count; return count;
} }
static ssize_t show_pwm_mode(struct device *dev, static ssize_t pwm1_mode_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "0\n"); return sprintf(buf, "0\n");
} }
static ssize_t show_rpm_min(struct device *dev, static ssize_t fan1_min_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", fan_data->speed[0].rpm); return sprintf(buf, "%d\n", fan_data->speed[0].rpm);
} }
static ssize_t show_rpm_max(struct device *dev, static ssize_t fan1_max_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
...@@ -280,8 +281,8 @@ static ssize_t show_rpm_max(struct device *dev, ...@@ -280,8 +281,8 @@ static ssize_t show_rpm_max(struct device *dev,
fan_data->speed[fan_data->num_speed - 1].rpm); fan_data->speed[fan_data->num_speed - 1].rpm);
} }
static ssize_t show_rpm(struct device *dev, static ssize_t fan1_input_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct gpio_fan_data *fan_data = dev_get_drvdata(dev); struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
...@@ -313,14 +314,13 @@ static ssize_t set_rpm(struct device *dev, struct device_attribute *attr, ...@@ -313,14 +314,13 @@ static ssize_t set_rpm(struct device *dev, struct device_attribute *attr,
return ret; return ret;
} }
static DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm); static DEVICE_ATTR_RW(pwm1);
static DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(pwm1_enable);
show_pwm_enable, set_pwm_enable); static DEVICE_ATTR_RO(pwm1_mode);
static DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL); static DEVICE_ATTR_RO(fan1_min);
static DEVICE_ATTR(fan1_min, S_IRUGO, show_rpm_min, NULL); static DEVICE_ATTR_RO(fan1_max);
static DEVICE_ATTR(fan1_max, S_IRUGO, show_rpm_max, NULL); static DEVICE_ATTR_RO(fan1_input);
static DEVICE_ATTR(fan1_input, S_IRUGO, show_rpm, NULL); static DEVICE_ATTR(fan1_target, S_IRUGO | S_IWUSR, fan1_input_show, set_rpm);
static DEVICE_ATTR(fan1_target, S_IRUGO | S_IWUSR, show_rpm, set_rpm);
static umode_t gpio_fan_is_visible(struct kobject *kobj, static umode_t gpio_fan_is_visible(struct kobject *kobj,
struct attribute *attr, int index) struct attribute *attr, int index)
......
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