Commit 54a19fd4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Wolfram Sang
Browse files

i2c: core: Use DEVICE_ATTR_*() helper macros 



Convert the i2c core sysfs attributes from DEVICE_ATTR() to
DEVICE_ATTR_*(), to reduce boilerplate.
This requires renaming some functions.

Although no suitable macro exists for the delete_device attribute,
rename i2c_sysfs_delete_device() to delete_device_store() for
consistency.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent c807da53

drivers/i2c/i2c-core-base.c

+10 −10
Original line number Diff line number Diff line
@@ -449,15 +449,15 @@ static void i2c_client_dev_release(struct device *dev) 
}



static ssize_t

show_name(struct device *dev, struct device_attribute *attr, char *buf)

name_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "%s\n", dev->type == &i2c_client_type ?

		       to_i2c_client(dev)->name : to_i2c_adapter(dev)->name);

}

static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);

static DEVICE_ATTR_RO(name);



static ssize_t

show_modalias(struct device *dev, struct device_attribute *attr, char *buf)

modalias_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct i2c_client *client = to_i2c_client(dev);

	int len;
@@ -472,7 +472,7 @@ show_modalias(struct device *dev, struct device_attribute *attr, char *buf) 


	return sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);

}

static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);

static DEVICE_ATTR_RO(modalias);



static struct attribute *i2c_dev_attrs[] = {

	&dev_attr_name.attr,
@@ -1016,7 +1016,7 @@ EXPORT_SYMBOL_GPL(i2c_adapter_depth); 
 * the user to provide incorrect parameters.

 */

static ssize_t

i2c_sysfs_new_device(struct device *dev, struct device_attribute *attr,

new_device_store(struct device *dev, struct device_attribute *attr,

		 const char *buf, size_t count)

{

	struct i2c_adapter *adap = to_i2c_adapter(dev);
@@ -1072,7 +1072,7 @@ i2c_sysfs_new_device(struct device *dev, struct device_attribute *attr, 


	return count;

}

static DEVICE_ATTR(new_device, S_IWUSR, NULL, i2c_sysfs_new_device);

static DEVICE_ATTR_WO(new_device);



/*

 * And of course let the users delete the devices they instantiated, if
@@ -1084,7 +1084,7 @@ static DEVICE_ATTR(new_device, S_IWUSR, NULL, i2c_sysfs_new_device); 
 * the user to delete the wrong device.

 */

static ssize_t

i2c_sysfs_delete_device(struct device *dev, struct device_attribute *attr,

delete_device_store(struct device *dev, struct device_attribute *attr,

		    const char *buf, size_t count)

{

	struct i2c_adapter *adap = to_i2c_adapter(dev);
@@ -1128,7 +1128,7 @@ i2c_sysfs_delete_device(struct device *dev, struct device_attribute *attr, 
	return res;

}

static DEVICE_ATTR_IGNORE_LOCKDEP(delete_device, S_IWUSR, NULL,

				   i2c_sysfs_delete_device);

				  delete_device_store);



static struct attribute *i2c_adapter_attrs[] = {

	&dev_attr_name.attr,