diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-02-14 16:26:14 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 11:47:33 -0800 |
| commit | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch) | |
| tree | 379340a7ab563df42ddb2907be6f282202244077 /drivers/char/pcmcia | |
| parent | adf9251fe9b87b5a50deebe489db2df8df4715fc (diff) | |
| download | kernel_samsung_smdk4412-60b33c133ca0b7c0b6072c87234b63fee6e80558.zip kernel_samsung_smdk4412-60b33c133ca0b7c0b6072c87234b63fee6e80558.tar.gz kernel_samsung_smdk4412-60b33c133ca0b7c0b6072c87234b63fee6e80558.tar.bz2 | |
tiocmget: kill off the passing of the struct file
We don't actually need this and it causes problems for internal use of
this functionality. Currently there is a single use of the FILE * pointer.
That is the serial core which uses it to check tty_hung_up_p. However if
that is true then IO_ERROR is also already set so the check may be removed.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/pcmcia')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/tty.c | 2 | ||||
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c index f5eb28b..7d2ef49 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/char/pcmcia/ipwireless/tty.c @@ -395,7 +395,7 @@ static int set_control_lines(struct ipw_tty *tty, unsigned int set, return 0; } -static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file) +static int ipw_tiocmget(struct tty_struct *linux_tty) { struct ipw_tty *tty = linux_tty->driver_data; /* FIXME: Exactly how is the tty object locked here .. */ diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index eaa4199..7b68ba6 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -418,7 +418,7 @@ static void bh_status(MGSLPC_INFO *info); /* * ioctl handlers */ -static int tiocmget(struct tty_struct *tty, struct file *file); +static int tiocmget(struct tty_struct *tty); static int tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear); static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount); @@ -2114,7 +2114,7 @@ static int modem_input_wait(MGSLPC_INFO *info,int arg) /* return the state of the serial control and status signals */ -static int tiocmget(struct tty_struct *tty, struct file *file) +static int tiocmget(struct tty_struct *tty) { MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; unsigned int result; |