Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4acfaf829dacb8f8170b439d30065e8d2cfdaac9

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 3e858759f7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

usb/serial: fix function args warnings, dropping *filp 

Fix build warnings caused by removal of *filp arg in struct
usb_serial_driver.

These changes were missed somehow in commits 00a0d0d65b61 ("tty: remove
filp from the USB tty ioctls") and 60b33c133ca0b ("tiocmget: kill off
the passing of the struct file")

  drivers/usb/serial/mct_u232.c:159: warning: initialization from incompatible pointer type
  drivers/usb/serial/opticon.c:627: warning: initialization from incompatible pointer type

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

drivers/usb/serial/mct_u232.c
Diff comments   View file @ 4acfaf8
... ... @@ -106,7 +106,7 @@
106 106 static int mct_u232_tiocmget(struct tty_struct *tty);
107 107 static int mct_u232_tiocmset(struct tty_struct *tty,
108 108 unsigned int set, unsigned int clear);
109   -static int mct_u232_ioctl(struct tty_struct *tty, struct file *file,
  109 +static int mct_u232_ioctl(struct tty_struct *tty,
110 110 unsigned int cmd, unsigned long arg);
111 111 static int mct_u232_get_icount(struct tty_struct *tty,
112 112 struct serial_icounter_struct *icount);
... ... @@ -874,7 +874,7 @@
874 874 }
875 875 }
876 876  
877   -static int mct_u232_ioctl(struct tty_struct *tty, struct file *file,
  877 +static int mct_u232_ioctl(struct tty_struct *tty,
878 878 unsigned int cmd, unsigned long arg)
879 879 {
880 880 DEFINE_WAIT(wait);
drivers/usb/serial/opticon.c
Diff comments   View file @ 4acfaf8
... ... @@ -413,7 +413,7 @@
413 413 return result;
414 414 }
415 415  
416   -static int opticon_tiocmset(struct tty_struct *tty, struct file *file,
  416 +static int opticon_tiocmset(struct tty_struct *tty,
417 417 unsigned int set, unsigned int clear)
418 418 {
419 419 struct usb_serial_port *port = tty->driver_data;