Skip to content

Commit

Permalink
w1: remove CONFIG_HOTPLUG ifdefs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 82849a9 commit 2c9e9fd
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/w1/w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,6 @@ void w1_destroy_master_attributes(struct w1_master *master)
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)
{
struct w1_master *md = NULL;
Expand Down Expand Up @@ -587,12 +586,6 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
end:
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)
{
Expand Down

0 comments on commit 2c9e9fd

Please sign in to comment.