summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/message.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:19:16 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 13:27:16 -0800
commit2bd6a021e887c675116ff8cdacc3af49999a2224 (patch)
tree0459f13c700834c12a9d22edbd059d9b3fd4083d /drivers/usb/core/message.c
parentd3cec81fc929b6edc43bd42725929685359adef7 (diff)
downloadblackbird-obmc-linux-2bd6a021e887c675116ff8cdacc3af49999a2224.tar.gz
blackbird-obmc-linux-2bd6a021e887c675116ff8cdacc3af49999a2224.zip
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.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index a557658f3223..73c5d1a04135 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)
kfree(intf);
}
-#ifdef CONFIG_HOTPLUG
static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
{
struct usb_device *usb_dev;
@@ -1575,14 +1574,6 @@ static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0;
}
-#else
-
-static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
- return -ENODEV;
-}
-#endif /* CONFIG_HOTPLUG */
-
struct device_type usb_if_device_type = {
.name = "usb_interface",
.release = usb_release_interface,
OpenPOWER on IntegriCloud