Skip to content

Commit

Permalink
usb/serial: fix function args warnings, dropping *filp
Browse files Browse the repository at this point in the history
Fix build warnings caused by removal of *filp arg in struct
usb_serial_driver.

These changes were missed somehow in commits 00a0d0d ("tty: remove
filp from the USB tty ioctls") and 60b33c1 ("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>
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Apr 4, 2011
1 parent 3e85875 commit 4acfaf8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/serial/mct_u232.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static void mct_u232_break_ctl(struct tty_struct *tty, int break_state);
static int mct_u232_tiocmget(struct tty_struct *tty);
static int mct_u232_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear);
static int mct_u232_ioctl(struct tty_struct *tty, struct file *file,
static int mct_u232_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static int mct_u232_get_icount(struct tty_struct *tty,
struct serial_icounter_struct *icount);
Expand Down Expand Up @@ -874,7 +874,7 @@ static void mct_u232_unthrottle(struct tty_struct *tty)
}
}

static int mct_u232_ioctl(struct tty_struct *tty, struct file *file,
static int mct_u232_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
DEFINE_WAIT(wait);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/serial/opticon.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static int opticon_tiocmget(struct tty_struct *tty)
return result;
}

static int opticon_tiocmset(struct tty_struct *tty, struct file *file,
static int opticon_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = tty->driver_data;
Expand Down

0 comments on commit 4acfaf8

Please sign in to comment.