Commit f799e767 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: serial: remove usb_serial_register and usb_serial_deregister

No one uses them anymore, they should be using the safer
usb_serial_register_drivers() and usb_serial_deregister_drivers()
functions instead.

Thanks to Alan Stern for writing these functions and porting all
in-kernel users to them.

Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c49fc99
...@@ -1338,12 +1338,7 @@ static void fixup_generic(struct usb_serial_driver *device) ...@@ -1338,12 +1338,7 @@ static void fixup_generic(struct usb_serial_driver *device)
set_to_generic_if_null(device, prepare_write_buffer); set_to_generic_if_null(device, prepare_write_buffer);
} }
/* static int usb_serial_register(struct usb_serial_driver *driver)
* The next two routines are mainly for internal use.
* They are exported only for out-of-tree modules.
* New drivers should call usb_serial_{de}register_drivers() instead.
*/
int usb_serial_register(struct usb_serial_driver *driver)
{ {
int retval; int retval;
...@@ -1377,10 +1372,8 @@ int usb_serial_register(struct usb_serial_driver *driver) ...@@ -1377,10 +1372,8 @@ int usb_serial_register(struct usb_serial_driver *driver)
mutex_unlock(&table_lock); mutex_unlock(&table_lock);
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(usb_serial_register);
void usb_serial_deregister(struct usb_serial_driver *device) static void usb_serial_deregister(struct usb_serial_driver *device)
{ {
printk(KERN_INFO "USB Serial deregistering driver %s\n", printk(KERN_INFO "USB Serial deregistering driver %s\n",
device->description); device->description);
...@@ -1389,7 +1382,6 @@ void usb_serial_deregister(struct usb_serial_driver *device) ...@@ -1389,7 +1382,6 @@ void usb_serial_deregister(struct usb_serial_driver *device)
usb_serial_bus_deregister(device); usb_serial_bus_deregister(device);
mutex_unlock(&table_lock); mutex_unlock(&table_lock);
} }
EXPORT_SYMBOL_GPL(usb_serial_deregister);
/** /**
* usb_serial_register_drivers - register drivers for a usb-serial module * usb_serial_register_drivers - register drivers for a usb-serial module
......
...@@ -300,13 +300,6 @@ struct usb_serial_driver { ...@@ -300,13 +300,6 @@ struct usb_serial_driver {
#define to_usb_serial_driver(d) \ #define to_usb_serial_driver(d) \
container_of(d, struct usb_serial_driver, driver) container_of(d, struct usb_serial_driver, driver)
/*
* These two routines are kept only for backward compatibility.
* Don't use them; call usb_serial_{de}register_drivers() instead.
*/
extern int usb_serial_register(struct usb_serial_driver *driver);
extern void usb_serial_deregister(struct usb_serial_driver *driver);
extern int usb_serial_register_drivers(struct usb_driver *udriver, extern int usb_serial_register_drivers(struct usb_driver *udriver,
struct usb_serial_driver * const serial_drivers[]); struct usb_serial_driver * const serial_drivers[]);
extern void usb_serial_deregister_drivers(struct usb_driver *udriver, extern void usb_serial_deregister_drivers(struct usb_driver *udriver,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment