Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f40982 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

w1: slaves: w1_ds2433: 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: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3c6061d

drivers/w1/slaves/w1_ds2433.c

+22 −25
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ static int w1_f23_refresh_block(struct w1_slave *sl, struct w1_f23_data *data, 
}

#endif	/* CONFIG_W1_SLAVE_DS2433_CRC */



static ssize_t w1_f23_read_bin(struct file *filp, struct kobject *kobj,

			       struct bin_attribute *bin_attr,

			       char *buf, loff_t off, size_t count)

static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,

			   struct bin_attribute *bin_attr, char *buf,

			   loff_t off, size_t count)

{

	struct w1_slave *sl = kobj_to_w1_slave(kobj);

#ifdef CONFIG_W1_SLAVE_DS2433_CRC
@@ -207,9 +207,9 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) 
	return 0;

}



static ssize_t w1_f23_write_bin(struct file *filp, struct kobject *kobj,

				struct bin_attribute *bin_attr,

				char *buf, loff_t off, size_t count)

static ssize_t eeprom_write(struct file *filp, struct kobject *kobj,

			    struct bin_attribute *bin_attr, char *buf,

			    loff_t off, size_t count)

{

	struct w1_slave *sl = kobj_to_w1_slave(kobj);

	int addr, len, idx;
@@ -257,19 +257,24 @@ out_up: 
	return count;

}



static struct bin_attribute w1_f23_bin_attr = {

	.attr = {

		.name = "eeprom",

		.mode = S_IRUGO | S_IWUSR,

	},

	.size = W1_EEPROM_SIZE,

	.read = w1_f23_read_bin,

	.write = w1_f23_write_bin,

static BIN_ATTR_RW(eeprom, W1_EEPROM_SIZE);



static struct bin_attribute *w1_f23_bin_attributes[] = {

	&bin_attr_eeprom,

	NULL,

};



static const struct attribute_group w1_f23_group = {

	.bin_attrs = w1_f23_bin_attributes,

};



static const struct attribute_group *w1_f23_groups[] = {

	&w1_f23_group,

	NULL,

};



static int w1_f23_add_slave(struct w1_slave *sl)

{

	int err;

#ifdef CONFIG_W1_SLAVE_DS2433_CRC

	struct w1_f23_data *data;
@@ -279,15 +284,7 @@ static int w1_f23_add_slave(struct w1_slave *sl) 
	sl->family_data = data;



#endif	/* CONFIG_W1_SLAVE_DS2433_CRC */



	err = sysfs_create_bin_file(&sl->dev.kobj, &w1_f23_bin_attr);



#ifdef CONFIG_W1_SLAVE_DS2433_CRC

	if (err)

		kfree(data);

#endif	/* CONFIG_W1_SLAVE_DS2433_CRC */



	return err;

	return 0;

}



static void w1_f23_remove_slave(struct w1_slave *sl)
@@ -296,12 +293,12 @@ static void w1_f23_remove_slave(struct w1_slave *sl) 
	kfree(sl->family_data);

	sl->family_data = NULL;

#endif	/* CONFIG_W1_SLAVE_DS2433_CRC */

	sysfs_remove_bin_file(&sl->dev.kobj, &w1_f23_bin_attr);

}



static struct w1_family_ops w1_f23_fops = {

	.add_slave      = w1_f23_add_slave,

	.remove_slave   = w1_f23_remove_slave,

	.groups		= w1_f23_groups,

};



static struct w1_family w1_family_23 = {