diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2009-06-11 07:26:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:50:56 -0400 |
| commit | 335f8514f200e63d689113d29cb7253a5c282967 (patch) | |
| tree | 11504d090e8e2cd3c1ada3e6765f69f216065d00 /drivers/usb/serial/keyspan.h | |
| parent | 1ec739be75a6cb961a46ba0b1982d0edb7f27558 (diff) | |
tty: Bring the usb tty port structure into more use
This allows us to clean stuff up, but is probably also going to cause
some app breakage with buggy apps as we now implement proper POSIX behaviour
for USB ports matching all the other ports. This does also mean other apps
that break on USB will now work properly.
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.h')
| -rw-r--r-- | drivers/usb/serial/keyspan.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index 38b4582e0734..0d4569b60768 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
| @@ -38,9 +38,8 @@ | |||
| 38 | static int keyspan_open (struct tty_struct *tty, | 38 | static int keyspan_open (struct tty_struct *tty, |
| 39 | struct usb_serial_port *port, | 39 | struct usb_serial_port *port, |
| 40 | struct file *filp); | 40 | struct file *filp); |
| 41 | static void keyspan_close (struct tty_struct *tty, | 41 | static void keyspan_close (struct usb_serial_port *port); |
| 42 | struct usb_serial_port *port, | 42 | static void keyspan_dtr_rts (struct usb_serial_port *port, int on); |
| 43 | struct file *filp); | ||
| 44 | static int keyspan_startup (struct usb_serial *serial); | 43 | static int keyspan_startup (struct usb_serial *serial); |
| 45 | static void keyspan_shutdown (struct usb_serial *serial); | 44 | static void keyspan_shutdown (struct usb_serial *serial); |
| 46 | static int keyspan_write_room (struct tty_struct *tty); | 45 | static int keyspan_write_room (struct tty_struct *tty); |
| @@ -562,6 +561,7 @@ static struct usb_serial_driver keyspan_1port_device = { | |||
| 562 | .num_ports = 1, | 561 | .num_ports = 1, |
| 563 | .open = keyspan_open, | 562 | .open = keyspan_open, |
| 564 | .close = keyspan_close, | 563 | .close = keyspan_close, |
| 564 | .dtr_rts = keyspan_dtr_rts, | ||
| 565 | .write = keyspan_write, | 565 | .write = keyspan_write, |
| 566 | .write_room = keyspan_write_room, | 566 | .write_room = keyspan_write_room, |
| 567 | .set_termios = keyspan_set_termios, | 567 | .set_termios = keyspan_set_termios, |
| @@ -582,6 +582,7 @@ static struct usb_serial_driver keyspan_2port_device = { | |||
| 582 | .num_ports = 2, | 582 | .num_ports = 2, |
| 583 | .open = keyspan_open, | 583 | .open = keyspan_open, |
| 584 | .close = keyspan_close, | 584 | .close = keyspan_close, |
| 585 | .dtr_rts = keyspan_dtr_rts, | ||
| 585 | .write = keyspan_write, | 586 | .write = keyspan_write, |
| 586 | .write_room = keyspan_write_room, | 587 | .write_room = keyspan_write_room, |
| 587 | .set_termios = keyspan_set_termios, | 588 | .set_termios = keyspan_set_termios, |
| @@ -602,6 +603,7 @@ static struct usb_serial_driver keyspan_4port_device = { | |||
| 602 | .num_ports = 4, | 603 | .num_ports = 4, |
| 603 | .open = keyspan_open, | 604 | .open = keyspan_open, |
| 604 | .close = keyspan_close, | 605 | .close = keyspan_close, |
| 606 | .dtr_rts = keyspan_dtr_rts, | ||
| 605 | .write = keyspan_write, | 607 | .write = keyspan_write, |
| 606 | .write_room = keyspan_write_room, | 608 | .write_room = keyspan_write_room, |
| 607 | .set_termios = keyspan_set_termios, | 609 | .set_termios = keyspan_set_termios, |