lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: serial: remove usb_serial_register and usb_serial_deregister

Browse Source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-02-24 12:50:30 -08:00
parent 8c49fc99b6
commit f799e76783
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/serial/usb-serial.c
View File

@@ -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)
mutex_unlock(&table_lock); mutex_unlock(&table_lock);
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(usb_serial_register);
static void usb_serial_deregister(struct usb_serial_driver *device)
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)
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

7
include/linux/usb/serial.h
View File

@@ -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,