提交 bfb6b173 编写于 作者: J Julia Lawall 提交者: Guenter Roeck

hwmon: (adm1031) use permission-specific DEVICE_ATTR variants

Use 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: NJulia Lawall <Julia.Lawall@lip6.fr>
[groeck: Updated description]
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 6d3c213d
...@@ -829,14 +829,14 @@ temp_reg(2); ...@@ -829,14 +829,14 @@ temp_reg(2);
temp_reg(3); temp_reg(3);
/* Alarms */ /* Alarms */
static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct adm1031_data *data = adm1031_update_device(dev); struct adm1031_data *data = adm1031_update_device(dev);
return sprintf(buf, "%d\n", data->alarm); return sprintf(buf, "%d\n", data->alarm);
} }
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR_RO(alarms);
static ssize_t show_alarm(struct device *dev, static ssize_t show_alarm(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
...@@ -867,7 +867,7 @@ static const unsigned int update_intervals[] = { ...@@ -867,7 +867,7 @@ static const unsigned int update_intervals[] = {
16000, 8000, 4000, 2000, 1000, 500, 250, 125, 16000, 8000, 4000, 2000, 1000, 500, 250, 125,
}; };
static ssize_t show_update_interval(struct device *dev, static ssize_t update_interval_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct adm1031_data *data = dev_get_drvdata(dev); struct adm1031_data *data = dev_get_drvdata(dev);
...@@ -875,9 +875,9 @@ static ssize_t show_update_interval(struct device *dev, ...@@ -875,9 +875,9 @@ static ssize_t show_update_interval(struct device *dev,
return sprintf(buf, "%u\n", data->update_interval); return sprintf(buf, "%u\n", data->update_interval);
} }
static ssize_t set_update_interval(struct device *dev, static ssize_t update_interval_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct adm1031_data *data = dev_get_drvdata(dev); struct adm1031_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
...@@ -912,8 +912,7 @@ static ssize_t set_update_interval(struct device *dev, ...@@ -912,8 +912,7 @@ static ssize_t set_update_interval(struct device *dev,
return count; return count;
} }
static DEVICE_ATTR(update_interval, S_IRUGO | S_IWUSR, show_update_interval, static DEVICE_ATTR_RW(update_interval);
set_update_interval);
static struct attribute *adm1031_attributes[] = { static struct attribute *adm1031_attributes[] = {
&sensor_dev_attr_fan1_input.dev_attr.attr, &sensor_dev_attr_fan1_input.dev_attr.attr,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册