diff options
Diffstat (limited to 'drivers/usb/serial/cypress_m8.c')
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 59adfe123110..df1adb9a4367 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -172,8 +172,7 @@ static int cypress_earthmate_startup(struct usb_serial *serial); | |||
172 | static int cypress_hidcom_startup(struct usb_serial *serial); | 172 | static int cypress_hidcom_startup(struct usb_serial *serial); |
173 | static int cypress_ca42v2_startup(struct usb_serial *serial); | 173 | static int cypress_ca42v2_startup(struct usb_serial *serial); |
174 | static void cypress_release(struct usb_serial *serial); | 174 | static void cypress_release(struct usb_serial *serial); |
175 | static int cypress_open(struct tty_struct *tty, | 175 | static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port); |
176 | struct usb_serial_port *port, struct file *filp); | ||
177 | static void cypress_close(struct usb_serial_port *port); | 176 | static void cypress_close(struct usb_serial_port *port); |
178 | static void cypress_dtr_rts(struct usb_serial_port *port, int on); | 177 | static void cypress_dtr_rts(struct usb_serial_port *port, int on); |
179 | static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port, | 178 | static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port, |
@@ -633,8 +632,7 @@ static void cypress_release(struct usb_serial *serial) | |||
633 | } | 632 | } |
634 | 633 | ||
635 | 634 | ||
636 | static int cypress_open(struct tty_struct *tty, | 635 | static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port) |
637 | struct usb_serial_port *port, struct file *filp) | ||
638 | { | 636 | { |
639 | struct cypress_private *priv = usb_get_serial_port_data(port); | 637 | struct cypress_private *priv = usb_get_serial_port_data(port); |
640 | struct usb_serial *serial = port->serial; | 638 | struct usb_serial *serial = port->serial; |