OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w1: slaves: w1_ds2781: convert to use w1_family_ops.groups 

This moves the sysfs file creation/removal to the w1 core by using the
.groups field, saving code in the slave driver.

Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-21 15:45:05 -07:00
parent 0597129cdc
commit eefafb79a4
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/w1/slaves/w1_ds2781.c
View File

@ -87,22 +87,28 @@ int w1_ds2781_eeprom_cmd(struct device *dev, int addr, int cmd)
} }
EXPORT_SYMBOL(w1_ds2781_eeprom_cmd); EXPORT_SYMBOL(w1_ds2781_eeprom_cmd);
static ssize_t w1_ds2781_read_bin(struct file *filp, static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj,
struct kobject *kobj, struct bin_attribute *bin_attr, char *buf,
struct bin_attribute *bin_attr, loff_t off, size_t count)
char *buf, loff_t off, size_t count)
{ {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
return w1_ds2781_io(dev, buf, off, count, 0); return w1_ds2781_io(dev, buf, off, count, 0);
} }
static struct bin_attribute w1_ds2781_bin_attr = { static BIN_ATTR_RO(w1_slave, DS2781_DATA_SIZE);
.attr = {
.name = "w1_slave", static struct bin_attribute *w1_ds2781_bin_attrs[] = {
.mode = S_IRUGO, &bin_attr_w1_slave,
}, NULL,
.size = DS2781_DATA_SIZE, };
.read = w1_ds2781_read_bin,
static const struct attribute_group w1_ds2781_group = {
.bin_attrs = w1_ds2781_bin_attrs,
};
static const struct attribute_group *w1_ds2781_groups[] = {
&w1_ds2781_group,
NULL,
}; };
static DEFINE_IDA(bat_ida); static DEFINE_IDA(bat_ida);
@ -130,16 +136,10 @@ static int w1_ds2781_add_slave(struct w1_slave *sl)
if (ret) if (ret)
goto pdev_add_failed; goto pdev_add_failed;
ret = sysfs_create_bin_file(&sl->dev.kobj, &w1_ds2781_bin_attr);
if (ret)
goto bin_attr_failed;
dev_set_drvdata(&sl->dev, pdev); dev_set_drvdata(&sl->dev, pdev);
return 0; return 0;
bin_attr_failed:
platform_device_del(pdev);
pdev_add_failed: pdev_add_failed:
platform_device_put(pdev); platform_device_put(pdev);
pdev_alloc_failed: pdev_alloc_failed:
@ -155,12 +155,12 @@ static void w1_ds2781_remove_slave(struct w1_slave *sl)
platform_device_unregister(pdev); platform_device_unregister(pdev);
ida_simple_remove(&bat_ida, id); ida_simple_remove(&bat_ida, id);
sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2781_bin_attr);
} }
static struct w1_family_ops w1_ds2781_fops = { static struct w1_family_ops w1_ds2781_fops = {
.add_slave = w1_ds2781_add_slave, .add_slave = w1_ds2781_add_slave,
.remove_slave = w1_ds2781_remove_slave, .remove_slave = w1_ds2781_remove_slave,
.groups = w1_ds2781_groups,
}; };
static struct w1_family w1_ds2781_family = { static struct w1_family w1_ds2781_family = {