diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 16:27:16 -0500 |
commit | 2bd6a021e887c675116ff8cdacc3af49999a2224 (patch) | |
tree | 0459f13c700834c12a9d22edbd059d9b3fd4083d /drivers/usb/core/message.c | |
parent | d3cec81fc929b6edc43bd42725929685359adef7 (diff) |
usb-core: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/message.c')
-rw-r--r-- | drivers/usb/core/message.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index a557658f322..73c5d1a0413 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1540,7 +1540,6 @@ static void usb_release_interface(struct device *dev) | |||
1540 | kfree(intf); | 1540 | kfree(intf); |
1541 | } | 1541 | } |
1542 | 1542 | ||
1543 | #ifdef CONFIG_HOTPLUG | ||
1544 | static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env) | 1543 | static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env) |
1545 | { | 1544 | { |
1546 | struct usb_device *usb_dev; | 1545 | struct usb_device *usb_dev; |
@@ -1575,14 +1574,6 @@ static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
1575 | return 0; | 1574 | return 0; |
1576 | } | 1575 | } |
1577 | 1576 | ||
1578 | #else | ||
1579 | |||
1580 | static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env) | ||
1581 | { | ||
1582 | return -ENODEV; | ||
1583 | } | ||
1584 | #endif /* CONFIG_HOTPLUG */ | ||
1585 | |||
1586 | struct device_type usb_if_device_type = { | 1577 | struct device_type usb_if_device_type = { |
1587 | .name = "usb_interface", | 1578 | .name = "usb_interface", |
1588 | .release = usb_release_interface, | 1579 | .release = usb_release_interface, |