usb_serial: Kill port mutex

The tty port has a port mutex used for all the port related locking so we
don't need the one in the USB serial layer any more.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 80f59b6350cb..c03fdc0242dd 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -501,12 +501,12 @@ static int opticon_resume(struct usb_interface *intf)
         struct usb_serial_port *port = serial->port[0];
         int result;
 
-        mutex_lock(&port->mutex);
+        mutex_lock(&port->port.mutex);
         if (port->port.count)
                 result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO);
         else
                 result = 0;
-        mutex_unlock(&port->mutex);
+        mutex_unlock(&port->port.mutex);
         return result;
 }
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 829a46684e1d..4543f359be75 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -897,7 +897,6 @@ int usb_serial_probe(struct usb_interface *interface,
                 spin_lock_init(&port->lock);
                 /* Keep this for private driver use for the moment but
                    should probably go away */
-                mutex_init(&port->mutex);
                 INIT_WORK(&port->work, usb_serial_port_work);
                 serial->port[i] = port;
                 port->dev.parent = &interface->dev;