[PATCH] w1: Added add/remove slave callbacks. (d2a4ef6a) · Commits · e / devices / android_kernel_sony_msm8998

drivers/w1/w1.c

+67 −54

Original line number	Diff line number	Diff line
		@@ -59,19 +59,6 @@ static pid_t control_thread;
		static int control_needs_exit;
		static DECLARE_COMPLETION(w1_control_complete);

		/* stuff for the default family */
		static ssize_t w1_famdefault_read_name(struct device dev, struct device_attribute attr, char *buf)
		{
		struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
		return(sprintf(buf, "%s\n", sl->name));
		}
		static struct w1_family_ops w1_default_fops = {
		.rname = &w1_famdefault_read_name,
		};
		static struct w1_family w1_default_family = {
		.fops = &w1_default_fops,
		};

		static int w1_master_match(struct device dev, struct device_driver drv)
		{
		return 1;
		@@ -99,30 +86,47 @@ static void w1_slave_release(struct device *dev)
		complete(&sl->dev_released);
		}

		static ssize_t w1_default_read_name(struct device dev, struct device_attribute attr, char *buf)
		static ssize_t w1_slave_read_name(struct device dev, struct device_attribute attr, char *buf)
		{
		return sprintf(buf, "No family registered.\n");
		struct w1_slave *sl = dev_to_w1_slave(dev);

		return sprintf(buf, "%s\n", sl->name);
		}

		static ssize_t w1_default_read_bin(struct kobject kobj, char buf, loff_t off,
		size_t count)
		static ssize_t w1_slave_read_id(struct kobject kobj, char buf, loff_t off, size_t count)
		{
		return sprintf(buf, "No family registered.\n");
		struct w1_slave *sl = kobj_to_w1_slave(kobj);

		atomic_inc(&sl->refcnt);
		if (off > 8) {
		count = 0;
		} else {
		if (off + count > 8)
		count = 8 - off;

		memcpy(buf, (u8 *)&sl->reg_num, count);
		}
		atomic_dec(&sl->refcnt);

		static struct device_attribute w1_slave_attribute =
		__ATTR(name, S_IRUGO, w1_default_read_name, NULL);
		return count;
		}

		static struct bin_attribute w1_slave_bin_attribute = {
		static struct device_attribute w1_slave_attr_name =
		__ATTR(name, S_IRUGO, w1_slave_read_name, NULL);

		static struct bin_attribute w1_slave_attr_bin_id = {
		.attr = {
		.name = "w1_slave",
		.name = "id",
		.mode = S_IRUGO,
		.owner = THIS_MODULE,
		},
		.size = W1_SLAVE_DATA_SIZE,
		.read = &w1_default_read_bin,
		.size = 8,
		.read = w1_slave_read_id,
		};

		/* Default family */
		static struct w1_family w1_default_family;

		static int w1_hotplug(struct device dev, char envp, int num_envp, char buffer, int buffer_size);

		static struct bus_type w1_bus_type = {
		@@ -413,36 +417,44 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
		return err;
		}

		memcpy(&sl->attr_bin, &w1_slave_bin_attribute, sizeof(sl->attr_bin));
		memcpy(&sl->attr_name, &w1_slave_attribute, sizeof(sl->attr_name));

		sl->attr_bin.read = sl->family->fops->rbin;
		sl->attr_name.show = sl->family->fops->rname;

		err = device_create_file(&sl->dev, &sl->attr_name);
		/* Create "name" entry */
		err = device_create_file(&sl->dev, &w1_slave_attr_name);
		if (err < 0) {
		dev_err(&sl->dev,
		"sysfs file creation for [%s] failed. err=%d\n",
		sl->dev.bus_id, err);
		device_unregister(&sl->dev);
		return err;
		goto out_unreg;
		}

		if ( sl->attr_bin.read ) {
		err = sysfs_create_bin_file(&sl->dev.kobj, &sl->attr_bin);
		/* Create "id" entry */
		err = sysfs_create_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
		if (err < 0) {
		dev_err(&sl->dev,
		"sysfs file creation for [%s] failed. err=%d\n",
		sl->dev.bus_id, err);
		device_remove_file(&sl->dev, &sl->attr_name);
		device_unregister(&sl->dev);
		return err;
		goto out_rem1;
		}

		/* if the family driver needs to initialize something... */
		if (sl->family->fops && sl->family->fops->add_slave &&
		((err = sl->family->fops->add_slave(sl)) < 0)) {
		dev_err(&sl->dev,
		"sysfs file creation for [%s] failed. err=%d\n",
		sl->dev.bus_id, err);
		goto out_rem2;
		}

		list_add_tail(&sl->w1_slave_entry, &sl->master->slist);

		return 0;

		out_rem2:
		sysfs_remove_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
		out_rem1:
		device_remove_file(&sl->dev, &w1_slave_attr_name);
		out_unreg:
		device_unregister(&sl->dev);
		return err;
		}

		static int w1_attach_slave_device(struct w1_master dev, struct w1_reg_num rn)
		@@ -517,10 +529,11 @@ static void w1_slave_detach(struct w1_slave *sl)
		flush_signals(current);
		}

		if ( sl->attr_bin.read ) {
		sysfs_remove_bin_file (&sl->dev.kobj, &sl->attr_bin);
		}
		device_remove_file(&sl->dev, &sl->attr_name);
		if (sl->family->fops && sl->family->fops->remove_slave)
		sl->family->fops->remove_slave(sl);

		sysfs_remove_bin_file(&sl->dev.kobj, &w1_slave_attr_bin_id);
		device_remove_file(&sl->dev, &w1_slave_attr_name);
		device_unregister(&sl->dev);
		w1_family_put(sl->family);

drivers/w1/w1.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -77,9 +77,6 @@ struct w1_slave
		struct w1_family *family;
		struct device dev;
		struct completion dev_released;

		struct bin_attribute attr_bin;
		struct device_attribute attr_name;
		};

		typedef void (* w1_slave_found_callback)(unsigned long, u64);

drivers/w1/w1_family.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -29,23 +29,12 @@ DEFINE_SPINLOCK(w1_flock);
		static LIST_HEAD(w1_families);
		extern void w1_reconnect_slaves(struct w1_family *f);

		static int w1_check_family(struct w1_family *f)
		{
		if (!f->fops->rname \|\| !f->fops->rbin)
		return -EINVAL;

		return 0;
		}

		int w1_register_family(struct w1_family *newf)
		{
		struct list_head ent, n;
		struct w1_family *f;
		int ret = 0;

		if (w1_check_family(newf))
		return -EINVAL;

		spin_lock(&w1_flock);
		list_for_each_safe(ent, n, &w1_families) {
		f = list_entry(ent, struct w1_family, family_entry);

drivers/w1/w1_family.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,12 @@

		#define MAXNAMELEN 32

		struct w1_slave;

		struct w1_family_ops
		{
		ssize_t (* rname)(struct device , struct device_attribute , char *);
		ssize_t (* rbin)(struct kobject , char , loff_t, size_t);
		int (* add_slave)(struct w1_slave *);
		void (* remove_slave)(struct w1_slave *);
		};

		struct w1_family

drivers/w1/w1_smem.c

+0 −47

Original line number	Diff line number	Diff line
		@@ -36,59 +36,12 @@ MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
		MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family.");

		static ssize_t w1_smem_read_name(struct device , struct device_attribute attr, char *);
		static ssize_t w1_smem_read_bin(struct kobject , char , loff_t, size_t);

		static struct w1_family_ops w1_smem_fops = {
		.rname = &w1_smem_read_name,
		.rbin = &w1_smem_read_bin,
		};

		static ssize_t w1_smem_read_name(struct device dev, struct device_attribute attr, char *buf)
		{
		struct w1_slave *sl = dev_to_w1_slave(dev);
		return sprintf(buf, "%s\n", sl->name);
		}

		static ssize_t w1_smem_read_bin(struct kobject kobj, char buf, loff_t off, size_t count)
		{
		struct w1_slave *sl = kobj_to_w1_slave(kobj);
		int i;

		atomic_inc(&sl->refcnt);
		if (down_interruptible(&sl->master->mutex)) {
		count = 0;
		goto out_dec;
		}

		if (off > W1_SLAVE_DATA_SIZE) {
		count = 0;
		goto out;
		}
		if (off + count > W1_SLAVE_DATA_SIZE) {
		count = 0;
		goto out;
		}
		for (i = 0; i < 8; ++i)
		count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
		count += sprintf(buf + count, "\n");

		out:
		up(&sl->master->mutex);
		out_dec:
		atomic_dec(&sl->refcnt);

		return count;
		}

		static struct w1_family w1_smem_family_01 = {
		.fid = W1_FAMILY_SMEM_01,
		.fops = &w1_smem_fops,
		};

		static struct w1_family w1_smem_family_81 = {
		.fid = W1_FAMILY_SMEM_81,
		.fops = &w1_smem_fops,
		};

		static int __init w1_smem_init(void)