aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
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 16:27:16 -0500
commit2bd6a021e887c675116ff8cdacc3af49999a2224 (patch)
tree0459f13c700834c12a9d22edbd059d9b3fd4083d /drivers/usb/serial
parentd3cec81fc929b6edc43bd42725929685359adef7 (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/serial')
-rw-r--r--drivers/usb/serial/bus.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index c15f2e7cefc..37decb13d7e 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -121,7 +121,6 @@ static int usb_serial_device_remove(struct device *dev)
121 return retval; 121 return retval;
122} 122}
123 123
124#ifdef CONFIG_HOTPLUG
125static ssize_t store_new_id(struct device_driver *driver, 124static ssize_t store_new_id(struct device_driver *driver,
126 const char *buf, size_t count) 125 const char *buf, size_t count)
127{ 126{
@@ -159,15 +158,6 @@ static void free_dynids(struct usb_serial_driver *drv)
159 spin_unlock(&drv->dynids.lock); 158 spin_unlock(&drv->dynids.lock);
160} 159}
161 160
162#else
163static struct driver_attribute drv_attrs[] = {
164 __ATTR_NULL,
165};
166static inline void free_dynids(struct usb_serial_driver *drv)
167{
168}
169#endif
170
171struct bus_type usb_serial_bus_type = { 161struct bus_type usb_serial_bus_type = {
172 .name = "usb-serial", 162 .name = "usb-serial",
173 .match = usb_serial_device_match, 163 .match = usb_serial_device_match,