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

Commit db2d0008 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman
Browse files

[PATCH] w1: Added inline functions on top of container_of(). 



Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5e8eb850

drivers/w1/w1.c

+10 −12
Original line number Diff line number Diff line
@@ -89,15 +89,13 @@ static int w1_master_remove(struct device *dev) 


static void w1_master_release(struct device *dev)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);



	struct w1_master *md = dev_to_w1_master(dev);

	complete(&md->dev_released);

}



static void w1_slave_release(struct device *dev)

{

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);



	struct w1_slave *sl = dev_to_w1_slave(dev);

	complete(&sl->dev_released);

}
@@ -162,7 +160,7 @@ struct device w1_slave_device = { 


static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible (&md->mutex))
@@ -179,7 +177,7 @@ static ssize_t w1_master_attribute_store_search(struct device * dev, 
						struct device_attribute *attr,

						const char * buf, size_t count)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);



	if (down_interruptible (&md->mutex))

		return -EBUSY;
@@ -195,7 +193,7 @@ static ssize_t w1_master_attribute_show_search(struct device *dev, 
					       struct device_attribute *attr,

					       char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible (&md->mutex))
@@ -210,7 +208,7 @@ static ssize_t w1_master_attribute_show_search(struct device *dev, 


static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible(&md->mutex))
@@ -231,7 +229,7 @@ static ssize_t w1_master_attribute_show_timeout(struct device *dev, struct devic 


static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible(&md->mutex))
@@ -245,7 +243,7 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, stru 


static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible(&md->mutex))
@@ -259,7 +257,7 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct devi 


static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	ssize_t count;



	if (down_interruptible(&md->mutex))
@@ -273,7 +271,7 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct d 


static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_master *md = container_of(dev, struct w1_master, dev);

	struct w1_master *md = dev_to_w1_master(dev);

	int c = PAGE_SIZE;



	if (down_interruptible(&md->mutex))

drivers/w1/w1.h

+15 −0
Original line number Diff line number Diff line
@@ -191,6 +191,21 @@ struct w1_master 
int w1_create_master_attributes(struct w1_master *);

void w1_search(struct w1_master *dev, w1_slave_found_callback cb);



static inline struct w1_slave* dev_to_w1_slave(struct device *dev)

{

	return container_of(dev, struct w1_slave, dev);

}



static inline struct w1_slave* kobj_to_w1_slave(struct kobject *kobj)

{

	return dev_to_w1_slave(container_of(kobj, struct device, kobj));

}



static inline struct w1_master* dev_to_w1_master(struct device *dev)

{

	return container_of(dev, struct w1_master, dev);

}



#endif /* __KERNEL__ */



#endif /* __W1_H */

drivers/w1/w1_smem.c

+2 −4
Original line number Diff line number Diff line
@@ -46,15 +46,13 @@ static struct w1_family_ops w1_smem_fops = { 


static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);



	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 = container_of(container_of(kobj, struct device, kobj),

					   struct w1_slave, dev);

	struct w1_slave *sl = kobj_to_w1_slave(kobj);

	int i;



	atomic_inc(&sl->refcnt);

drivers/w1/w1_therm.c

+2 −4
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ static struct w1_therm_family_converter w1_therm_families[] = { 


static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);



	struct w1_slave *sl = dev_to_w1_slave(dev);

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

}
@@ -148,8 +147,7 @@ static int w1_therm_check_rom(u8 rom[9]) 


static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count)

{

	struct w1_slave *sl = container_of(container_of(kobj, struct device, kobj),

					   struct w1_slave, dev);

	struct w1_slave *sl = kobj_to_w1_slave(kobj);

	struct w1_master *dev = sl->master;

	u8 rom[9], crc, verdict;

	int i, max_trying = 10;