diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:47:33 -0500 |
commit | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch) | |
tree | 379340a7ab563df42ddb2907be6f282202244077 /drivers/char/epca.c | |
parent | adf9251fe9b87b5a50deebe489db2df8df4715fc (diff) |
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/epca.c')
-rw-r--r-- | drivers/char/epca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index d9df46aa0fba..ecf6f0a889fc 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -1982,7 +1982,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file, | |||
1982 | return 0; | 1982 | return 0; |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | static int pc_tiocmget(struct tty_struct *tty, struct file *file) | 1985 | static int pc_tiocmget(struct tty_struct *tty) |
1986 | { | 1986 | { |
1987 | struct channel *ch = tty->driver_data; | 1987 | struct channel *ch = tty->driver_data; |
1988 | struct board_chan __iomem *bc; | 1988 | struct board_chan __iomem *bc; |
@@ -2074,7 +2074,7 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, | |||
2074 | return -EINVAL; | 2074 | return -EINVAL; |
2075 | switch (cmd) { | 2075 | switch (cmd) { |
2076 | case TIOCMODG: | 2076 | case TIOCMODG: |
2077 | mflag = pc_tiocmget(tty, file); | 2077 | mflag = pc_tiocmget(tty); |
2078 | if (put_user(mflag, (unsigned long __user *)argp)) | 2078 | if (put_user(mflag, (unsigned long __user *)argp)) |
2079 | return -EFAULT; | 2079 | return -EFAULT; |
2080 | break; | 2080 | break; |