openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

w1: remove CONFIG_HOTPLUG ifdefs 

Remove conditional code based on CONFIG_HOTPLUG being false.  It's
always on now in preparation of it going away as an option.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-11-19 13:19:15 -05:00 committed by Greg Kroah-Hartman
parent 82849a93aa
commit 2c9e9fdc0b
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/w1/w1.c
View File

@ -551,7 +551,6 @@ void w1_destroy_master_attributes(struct w1_master *master)
sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
} }
#ifdef CONFIG_HOTPLUG
static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct w1_master *md = NULL; struct w1_master *md = NULL;
@ -587,12 +586,6 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
end: end:
return err; return err;
} }
#else
static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
{
return 0;
}
#endif
static int __w1_attach_slave_device(struct w1_slave *sl) static int __w1_attach_slave_device(struct w1_slave *sl)
{ {