Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00a0d0d6 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tty: remove filp from the USB tty ioctls 



We don't use it so we can trim it from here as we try and stamp the file
object dependencies out of the serial code.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 20b9d177

drivers/staging/quatech_usb2/quatech_usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ static int qt2_chars_in_buffer(struct tty_struct *tty) 
 * TIOCMGET and TIOCMSET are filtered off to their own methods before they get

 * here, so we don't have to handle them.

 */

static int qt2_ioctl(struct tty_struct *tty, struct file *file,

static int qt2_ioctl(struct tty_struct *tty,

		     unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;

drivers/staging/serqt_usb2/serqt_usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static int qt_write_room(struct tty_struct *tty) 


}



static int qt_ioctl(struct tty_struct *tty, struct file *file,

static int qt_ioctl(struct tty_struct *tty,

		    unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;

drivers/usb/serial/ark3116.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static int ark3116_get_icount(struct tty_struct *tty, 
	return 0;

}



static int ark3116_ioctl(struct tty_struct *tty, struct file *file,

static int ark3116_ioctl(struct tty_struct *tty,

			 unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;

drivers/usb/serial/ch341.c

+1 −2
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) 
	return 0;

}



/*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/

static int ch341_ioctl(struct tty_struct *tty, struct file *file,

static int ch341_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;

drivers/usb/serial/cypress_m8.c

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port, 
			const unsigned char *buf, int count);

static void cypress_send(struct usb_serial_port *port);

static int  cypress_write_room(struct tty_struct *tty);

static int  cypress_ioctl(struct tty_struct *tty, struct file *file,

static int  cypress_ioctl(struct tty_struct *tty,

			unsigned int cmd, unsigned long arg);

static void cypress_set_termios(struct tty_struct *tty,

			struct usb_serial_port *port, struct ktermios *old);
@@ -917,7 +917,7 @@ static int cypress_tiocmset(struct tty_struct *tty, 
}





static int cypress_ioctl(struct tty_struct *tty, struct file *file,

static int cypress_ioctl(struct tty_struct *tty,

					unsigned int cmd, unsigned long arg)

{

	struct usb_serial_port *port = tty->driver_data;