mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hwmon: (atxp1) 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: Julia Lawall <Julia.Lawall@lip6.fr>
[groeck: Updated description]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Julia Lawall 2016-12-22 13:04:37 +01:00 committed by Guenter Roeck
parent 82e73f7f95
commit 0acf2a5f2a
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/hwmon/atxp1.c
View File

@ -81,8 +81,8 @@ static struct atxp1_data *atxp1_update_device(struct device *dev)
} }
/* sys file functions for cpu0_vid */ /* sys file functions for cpu0_vid */
static ssize_t atxp1_showvcore(struct device *dev, static ssize_t cpu0_vid_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
int size; int size;
struct atxp1_data *data; struct atxp1_data *data;
@ -95,9 +95,9 @@ static ssize_t atxp1_showvcore(struct device *dev,
return size; return size;
} }
static ssize_t atxp1_storevcore(struct device *dev, static ssize_t cpu0_vid_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr, const char *buf,
const char *buf, size_t count) size_t count)
{ {
struct atxp1_data *data = atxp1_update_device(dev); struct atxp1_data *data = atxp1_update_device(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
@ -154,12 +154,11 @@ static ssize_t atxp1_storevcore(struct device *dev,
* CPU core reference voltage * CPU core reference voltage
* unit: millivolt * unit: millivolt
*/ */
static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, static DEVICE_ATTR_RW(cpu0_vid);
atxp1_storevcore);
/* sys file functions for GPIO1 */ /* sys file functions for GPIO1 */
static ssize_t atxp1_showgpio1(struct device *dev, static ssize_t gpio1_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
int size; int size;
struct atxp1_data *data; struct atxp1_data *data;
@ -171,9 +170,8 @@ static ssize_t atxp1_showgpio1(struct device *dev,
return size; return size;
} }
static ssize_t atxp1_storegpio1(struct device *dev, static ssize_t gpio1_store(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, const char *buf, const char *buf, size_t count)
size_t count)
{ {
struct atxp1_data *data = atxp1_update_device(dev); struct atxp1_data *data = atxp1_update_device(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
@ -201,11 +199,11 @@ static ssize_t atxp1_storegpio1(struct device *dev,
* GPIO1 data register * GPIO1 data register
* unit: Four bit as hex (e.g. 0x0f) * unit: Four bit as hex (e.g. 0x0f)
*/ */
static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1); static DEVICE_ATTR_RW(gpio1);
/* sys file functions for GPIO2 */ /* sys file functions for GPIO2 */
static ssize_t atxp1_showgpio2(struct device *dev, static ssize_t gpio2_show(struct device *dev, struct device_attribute *attr,
struct device_attribute *attr, char *buf) char *buf)
{ {
int size; int size;
struct atxp1_data *data; struct atxp1_data *data;
@ -217,9 +215,8 @@ static ssize_t atxp1_showgpio2(struct device *dev,
return size; return size;
} }
static ssize_t atxp1_storegpio2(struct device *dev, static ssize_t gpio2_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 atxp1_data *data = atxp1_update_device(dev); struct atxp1_data *data = atxp1_update_device(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
@ -246,7 +243,7 @@ static ssize_t atxp1_storegpio2(struct device *dev,
* GPIO2 data register * GPIO2 data register
* unit: Eight bit as hex (e.g. 0xff) * unit: Eight bit as hex (e.g. 0xff)
*/ */
static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2); static DEVICE_ATTR_RW(gpio2);
static struct attribute *atxp1_attrs[] = { static struct attribute *atxp1_attrs[] = {
&dev_attr_gpio1.attr, &dev_attr_gpio1.attr,