diff options
Diffstat (limited to 'include/linux/usb/serial.h')
-rw-r--r-- | include/linux/usb/serial.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index ce911ebf91e8..1819396ed501 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/kref.h> | 16 | #include <linux/kref.h> |
17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
18 | #include <linux/sysrq.h> | 18 | #include <linux/sysrq.h> |
19 | #include <linux/kfifo.h> | ||
19 | 20 | ||
20 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ | 21 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ |
21 | #define SERIAL_TTY_MINORS 254 /* loads of devices :) */ | 22 | #define SERIAL_TTY_MINORS 254 /* loads of devices :) */ |
@@ -39,8 +40,6 @@ enum port_dev_state { | |||
39 | * @serial: pointer back to the struct usb_serial owner of this port. | 40 | * @serial: pointer back to the struct usb_serial owner of this port. |
40 | * @port: pointer to the corresponding tty_port for this port. | 41 | * @port: pointer to the corresponding tty_port for this port. |
41 | * @lock: spinlock to grab when updating portions of this structure. | 42 | * @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). | 43 | * @number: the number of the port (the minor number). |
45 | * @interrupt_in_buffer: pointer to the interrupt in buffer for this port. | 44 | * @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. | 45 | * @interrupt_in_urb: pointer to the interrupt in struct urb for this port. |
@@ -77,7 +76,6 @@ struct usb_serial_port { | |||
77 | struct usb_serial *serial; | 76 | struct usb_serial *serial; |
78 | struct tty_port port; | 77 | struct tty_port port; |
79 | spinlock_t lock; | 78 | spinlock_t lock; |
80 | struct mutex mutex; | ||
81 | unsigned char number; | 79 | unsigned char number; |
82 | 80 | ||
83 | unsigned char *interrupt_in_buffer; | 81 | unsigned char *interrupt_in_buffer; |
@@ -97,7 +95,7 @@ struct usb_serial_port { | |||
97 | unsigned char *bulk_out_buffer; | 95 | unsigned char *bulk_out_buffer; |
98 | int bulk_out_size; | 96 | int bulk_out_size; |
99 | struct urb *write_urb; | 97 | struct urb *write_urb; |
100 | struct kfifo *write_fifo; | 98 | struct kfifo write_fifo; |
101 | int write_urb_busy; | 99 | int write_urb_busy; |
102 | __u8 bulk_out_endpointAddress; | 100 | __u8 bulk_out_endpointAddress; |
103 | 101 | ||