diff options
Diffstat (limited to 'drivers/usb/serial/ch341.c')
-rw-r--r-- | drivers/usb/serial/ch341.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 14ac87ee9251..6ae1c0688b5e 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -432,7 +432,7 @@ out: | |||
432 | kfree(break_reg); | 432 | kfree(break_reg); |
433 | } | 433 | } |
434 | 434 | ||
435 | static int ch341_tiocmset(struct tty_struct *tty, struct file *file, | 435 | static int ch341_tiocmset(struct tty_struct *tty, |
436 | unsigned int set, unsigned int clear) | 436 | unsigned int set, unsigned int clear) |
437 | { | 437 | { |
438 | struct usb_serial_port *port = tty->driver_data; | 438 | struct usb_serial_port *port = tty->driver_data; |
@@ -553,8 +553,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) | |||
553 | return 0; | 553 | return 0; |
554 | } | 554 | } |
555 | 555 | ||
556 | /*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/ | 556 | static int ch341_ioctl(struct tty_struct *tty, |
557 | static int ch341_ioctl(struct tty_struct *tty, struct file *file, | ||
558 | unsigned int cmd, unsigned long arg) | 557 | unsigned int cmd, unsigned long arg) |
559 | { | 558 | { |
560 | struct usb_serial_port *port = tty->driver_data; | 559 | struct usb_serial_port *port = tty->driver_data; |
@@ -573,7 +572,7 @@ static int ch341_ioctl(struct tty_struct *tty, struct file *file, | |||
573 | return -ENOIOCTLCMD; | 572 | return -ENOIOCTLCMD; |
574 | } | 573 | } |
575 | 574 | ||
576 | static int ch341_tiocmget(struct tty_struct *tty, struct file *file) | 575 | static int ch341_tiocmget(struct tty_struct *tty) |
577 | { | 576 | { |
578 | struct usb_serial_port *port = tty->driver_data; | 577 | struct usb_serial_port *port = tty->driver_data; |
579 | struct ch341_private *priv = usb_get_serial_port_data(port); | 578 | struct ch341_private *priv = usb_get_serial_port_data(port); |