diff options
author | Alan Cox <alan@linux.intel.com> | 2009-10-06 11:06:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 18:18:04 -0500 |
commit | 82fc5943430e3cbf15033ed4186a73f90906345d (patch) | |
tree | 16e8168424072f02cba69c64bedf5d52915c9eda | |
parent | e1108a63e10d344284011cccc06328b2cd3e5da3 (diff) |
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>
-rw-r--r-- | drivers/usb/serial/opticon.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 1 | ||||
-rw-r--r-- | include/linux/usb/serial.h | 3 |
3 files changed, 2 insertions, 6 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) | |||
501 | struct usb_serial_port *port = serial->port[0]; | 501 | struct usb_serial_port *port = serial->port[0]; |
502 | int result; | 502 | int result; |
503 | 503 | ||
504 | mutex_lock(&port->mutex); | 504 | mutex_lock(&port->port.mutex); |
505 | if (port->port.count) | 505 | if (port->port.count) |
506 | result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO); | 506 | result = usb_submit_urb(priv->bulk_read_urb, GFP_NOIO); |
507 | else | 507 | else |
508 | result = 0; | 508 | result = 0; |
509 | mutex_unlock(&port->mutex); | 509 | mutex_unlock(&port->port.mutex); |
510 | return result; | 510 | return result; |
511 | } | 511 | } |
512 | 512 | ||
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, | |||
897 | spin_lock_init(&port->lock); | 897 | spin_lock_init(&port->lock); |
898 | /* Keep this for private driver use for the moment but | 898 | /* Keep this for private driver use for the moment but |
899 | should probably go away */ | 899 | should probably go away */ |
900 | mutex_init(&port->mutex); | ||
901 | INIT_WORK(&port->work, usb_serial_port_work); | 900 | INIT_WORK(&port->work, usb_serial_port_work); |
902 | serial->port[i] = port; | 901 | serial->port[i] = port; |
903 | port->dev.parent = &interface->dev; | 902 | port->dev.parent = &interface->dev; |
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index ce911ebf91e8..acf6e457c04b 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
@@ -39,8 +39,6 @@ enum port_dev_state { | |||
39 | * @serial: pointer back to the struct usb_serial owner of this port. | 39 | * @serial: pointer back to the struct usb_serial owner of this port. |
40 | * @port: pointer to the corresponding tty_port for this port. | 40 | * @port: pointer to the corresponding tty_port for this port. |
41 | * @lock: spinlock to grab when updating portions of this structure. | 41 | * @lock: spinlock to grab when updating portions of this structure. |
42 | * @mutex: mutex used to synchronize serial_open() and serial_close() | ||
43 | * access for this port. | ||
44 | * @number: the number of the port (the minor number). | 42 | * @number: the number of the port (the minor number). |
45 | * @interrupt_in_buffer: pointer to the interrupt in buffer for this port. | 43 | * @interrupt_in_buffer: pointer to the interrupt in buffer for this port. |
46 | * @interrupt_in_urb: pointer to the interrupt in struct urb for this port. | 44 | * @interrupt_in_urb: pointer to the interrupt in struct urb for this port. |
@@ -77,7 +75,6 @@ struct usb_serial_port { | |||
77 | struct usb_serial *serial; | 75 | struct usb_serial *serial; |
78 | struct tty_port port; | 76 | struct tty_port port; |
79 | spinlock_t lock; | 77 | spinlock_t lock; |
80 | struct mutex mutex; | ||
81 | unsigned char number; | 78 | unsigned char number; |
82 | 79 | ||
83 | unsigned char *interrupt_in_buffer; | 80 | unsigned char *interrupt_in_buffer; |