Commit 2c9e9fdc authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82849a93
...@@ -551,7 +551,6 @@ void w1_destroy_master_attributes(struct w1_master *master) ...@@ -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) ...@@ -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)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment