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

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

[PATCH] W1: cleanups 



Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the
completely new functionality.

Shame-shame-shame on me.

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

drivers/w1/w1.c

+4 −2
Original line number Diff line number Diff line
@@ -214,11 +214,12 @@ struct device w1_master_device = { 
	.release = &w1_master_release

};



struct device_driver w1_slave_driver = {

static struct device_driver w1_slave_driver = {

	.name = "w1_slave_driver",

	.bus = &w1_bus_type,

};



#if 0

struct device w1_slave_device = {

	.parent = NULL,

	.bus = &w1_bus_type,
@@ -226,6 +227,7 @@ struct device w1_slave_device = { 
	.driver = &w1_slave_driver,

	.release = &w1_slave_release

};

#endif  /*  0  */



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

{
@@ -383,7 +385,7 @@ int w1_create_master_attributes(struct w1_master *master) 
	return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);

}



void w1_destroy_master_attributes(struct w1_master *master)

static void w1_destroy_master_attributes(struct w1_master *master)

{

	sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);

}

drivers/w1/w1.h

+10 −0
Original line number Diff line number Diff line
@@ -213,6 +213,16 @@ static inline struct w1_master* dev_to_w1_master(struct device *dev) 
	return container_of(dev, struct w1_master, dev);

}



extern struct device_driver w1_master_driver;

extern struct bus_type w1_bus_type;

extern struct device w1_master_device;

extern int w1_max_slave_count;

extern int w1_max_slave_ttl;

extern struct list_head w1_masters;

extern struct mutex w1_mlock;



extern int w1_process(void *);



#endif /* __KERNEL__ */



#endif /* __W1_H */

drivers/w1/w1_int.c

+1 −11
Original line number Diff line number Diff line
@@ -30,16 +30,6 @@ 


static u32 w1_ids = 1;



extern struct device_driver w1_master_driver;

extern struct bus_type w1_bus_type;

extern struct device w1_master_device;

extern int w1_max_slave_count;

extern int w1_max_slave_ttl;

extern struct list_head w1_masters;

extern struct mutex w1_mlock;



extern int w1_process(void *);



static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,

				       struct device_driver *driver,

				       struct device *device)
@@ -96,7 +86,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, 
	return dev;

}



void w1_free_dev(struct w1_master *dev)

static void w1_free_dev(struct w1_master *dev)

{

	device_unregister(&dev->dev);

}