Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
2c9e9fdc 82849a93

-7
-7
drivers/w1/w1.c
··· 551 551 sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); 552 552 } 553 553 554 - #ifdef CONFIG_HOTPLUG 555 554 static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) 556 555 { 557 556 struct w1_master *md = NULL; ··· 586 587 end: 587 588 return err; 588 589 } 589 - #else 590 - static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) 591 - { 592 - return 0; 593 - } 594 - #endif 595 590 596 591 static int __w1_attach_slave_device(struct w1_slave *sl) 597 592 {