Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bd6a021 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3cec81f

drivers/usb/core/driver.c

+0 −25
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
#include "usb.h"





#ifdef CONFIG_HOTPLUG



/*

 * Adds a new dynamic USBdevice ID to this driver,

 * and cause the driver to probe for all devices again.
@@ -194,20 +192,6 @@ static void usb_free_dynids(struct usb_driver *usb_drv) 
	}

	spin_unlock(&usb_drv->dynids.lock);

}

#else

static inline int usb_create_newid_files(struct usb_driver *usb_drv)

{

	return 0;

}



static void usb_remove_newid_files(struct usb_driver *usb_drv)

{

}



static inline void usb_free_dynids(struct usb_driver *usb_drv)

{

}

#endif



static const struct usb_device_id *usb_match_dynamic_id(struct usb_interface *intf,

							struct usb_driver *drv)
@@ -790,7 +774,6 @@ static int usb_device_match(struct device *dev, struct device_driver *drv) 
	return 0;

}



#ifdef	CONFIG_HOTPLUG

static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct usb_device *usb_dev;
@@ -832,14 +815,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env) 
	return 0;

}



#else



static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	return -ENODEV;

}

#endif	/* CONFIG_HOTPLUG */



/**

 * usb_register_device_driver - register a USB device (not interface) driver

 * @new_udriver: USB operations for the device driver

drivers/usb/core/message.c

+0 −9
Original line number Diff line number Diff line
@@ -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,

drivers/usb/core/usb.c

+0 −9
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ static void usb_release_dev(struct device *dev) 
	kfree(udev);

}



#ifdef	CONFIG_HOTPLUG

static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct usb_device *usb_dev;
@@ -249,14 +248,6 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) 
	return 0;

}



#else



static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	return -ENODEV;

}

#endif	/* CONFIG_HOTPLUG */



#ifdef	CONFIG_PM



/* USB device Power-Management thunks.

drivers/usb/serial/bus.c

+0 −10
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ static int usb_serial_device_remove(struct device *dev) 
	return retval;

}



#ifdef CONFIG_HOTPLUG

static ssize_t store_new_id(struct device_driver *driver,

			    const char *buf, size_t count)

{
@@ -159,15 +158,6 @@ static void free_dynids(struct usb_serial_driver *drv) 
	spin_unlock(&drv->dynids.lock);

}



#else

static struct driver_attribute drv_attrs[] = {

	__ATTR_NULL,

};

static inline void free_dynids(struct usb_serial_driver *drv)

{

}

#endif



struct bus_type usb_serial_bus_type = {

	.name =		"usb-serial",

	.match =	usb_serial_device_match,