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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 45b3658c601f58be1add141df488582d5abeb422..63ba47dbcc71457f145513867e0236907dc7a5de 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1338,12 +1338,7 @@ static void fixup_generic(struct usb_serial_driver *device)
        set_to_generic_if_null(device, prepare_write_buffer);
 }
 
-/*
- * 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)
+static int usb_serial_register(struct usb_serial_driver *driver)
 {
        int retval;
 
@@ -1377,10 +1372,8 @@ int usb_serial_register(struct usb_serial_driver *driver)
        mutex_unlock(&table_lock);
        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",
               device->description);
@@ -1389,7 +1382,6 @@ void usb_serial_deregister(struct usb_serial_driver *device)
        usb_serial_bus_deregister(device);
        mutex_unlock(&table_lock);
 }
-EXPORT_SYMBOL_GPL(usb_serial_deregister);
 
 /**
  * usb_serial_register_drivers - register drivers for a usb-serial module

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 8c8dbf9c5b89345f3f7d85b92ca5e238a6a9c965..34c06a723dcc03fffdfc1193ee544e74eed85b86 100644 (file)
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -300,13 +300,6 @@ struct usb_serial_driver {
 #define to_usb_serial_driver(d) \
        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,
                struct usb_serial_driver * const serial_drivers[]);
 extern void usb_serial_deregister_drivers(struct usb_driver *udriver,