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

usb_serial: Kill port mutex

Browse Source 
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>
This commit is contained in:
Alan Cox
2009-10-06 16:06:46 +01:00
committed by Greg Kroah-Hartman
parent e1108a63e1
commit 82fc594343
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/serial/opticon.c
View File

@@ -501,12 +501,12 @@ static int opticon_resume(struct usb_interface *intf)
struct usb_serial_port *port = serial->port[0]; struct usb_serial_port *port = serial->port[0];
int result; int result;
mutex_lock(&port->mutex); mutex_lock(&port->port.mutex);
if (port->port.count) if (port->port.count)
result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO); result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO);
else else
result = 0; result = 0;
mutex_unlock(&port->mutex); mutex_unlock(&port->port.mutex);
return result; return result;
} }

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

@@ -897,7 +897,6 @@ int usb_serial_probe(struct usb_interface *interface,
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
/* Keep this for private driver use for the moment but /* Keep this for private driver use for the moment but
should probably go away */ should probably go away */
mutex_init(&port->mutex);
INIT_WORK(&port->work, usb_serial_port_work); INIT_WORK(&port->work, usb_serial_port_work);
serial->port[i] = port; serial->port[i] = port;
port->dev.parent = &interface->dev; port->dev.parent = &interface->dev;

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

@@ -39,8 +39,6 @@ enum port_dev_state {
* @serial: pointer back to the struct usb_serial owner of this port. * @serial: pointer back to the struct usb_serial owner of this port.
* @port: pointer to the corresponding tty_port for this port. * @port: pointer to the corresponding tty_port for this port.
* @lock: spinlock to grab when updating portions of this structure. * @lock: spinlock to grab when updating portions of this structure.
* @mutex: mutex used to synchronize serial_open() and serial_close()
* access for this port.
* @number: the number of the port (the minor number). * @number: the number of the port (the minor number).
* @interrupt_in_buffer: pointer to the interrupt in buffer for this port. * @interrupt_in_buffer: pointer to the interrupt in buffer for this port.
* @interrupt_in_urb: pointer to the interrupt in struct urb for this port. * @interrupt_in_urb: pointer to the interrupt in struct urb for this port.
@@ -77,7 +75,6 @@ struct usb_serial_port {
struct usb_serial *serial; struct usb_serial *serial;
struct tty_port port; struct tty_port port;
spinlock_t lock; spinlock_t lock;
struct mutex mutex;
unsigned char number; unsigned char number;
unsigned char *interrupt_in_buffer; unsigned char *interrupt_in_buffer;