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/synclink.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/synclink.c')
-rw-r--r-- | drivers/char/synclink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index 3a6824f12be2..d359e092904a 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -823,7 +823,7 @@ static isr_dispatch_func UscIsrTable[7] = | |||
823 | /* | 823 | /* |
824 | * ioctl call handlers | 824 | * ioctl call handlers |
825 | */ | 825 | */ |
826 | static int tiocmget(struct tty_struct *tty, struct file *file); | 826 | static int tiocmget(struct tty_struct *tty); |
827 | static int tiocmset(struct tty_struct *tty, struct file *file, | 827 | static int tiocmset(struct tty_struct *tty, struct file *file, |
828 | unsigned int set, unsigned int clear); | 828 | unsigned int set, unsigned int clear); |
829 | static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount | 829 | static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount |
@@ -2846,7 +2846,7 @@ static int modem_input_wait(struct mgsl_struct *info,int arg) | |||
2846 | 2846 | ||
2847 | /* return the state of the serial control and status signals | 2847 | /* return the state of the serial control and status signals |
2848 | */ | 2848 | */ |
2849 | static int tiocmget(struct tty_struct *tty, struct file *file) | 2849 | static int tiocmget(struct tty_struct *tty) |
2850 | { | 2850 | { |
2851 | struct mgsl_struct *info = tty->driver_data; | 2851 | struct mgsl_struct *info = tty->driver_data; |
2852 | unsigned int result; | 2852 | unsigned int result; |