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/ip2 | |
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/ip2')
-rw-r--r-- | drivers/char/ip2/ip2main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index c3a025356b8b..476cd087118e 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -181,7 +181,7 @@ static void ip2_unthrottle(PTTY); | |||
181 | static void ip2_stop(PTTY); | 181 | static void ip2_stop(PTTY); |
182 | static void ip2_start(PTTY); | 182 | static void ip2_start(PTTY); |
183 | static void ip2_hangup(PTTY); | 183 | static void ip2_hangup(PTTY); |
184 | static int ip2_tiocmget(struct tty_struct *tty, struct file *file); | 184 | static int ip2_tiocmget(struct tty_struct *tty); |
185 | static int ip2_tiocmset(struct tty_struct *tty, struct file *file, | 185 | static int ip2_tiocmset(struct tty_struct *tty, struct file *file, |
186 | unsigned int set, unsigned int clear); | 186 | unsigned int set, unsigned int clear); |
187 | static int ip2_get_icount(struct tty_struct *tty, | 187 | static int ip2_get_icount(struct tty_struct *tty, |
@@ -2038,7 +2038,7 @@ ip2_stop ( PTTY tty ) | |||
2038 | /* Device Ioctl Section */ | 2038 | /* Device Ioctl Section */ |
2039 | /******************************************************************************/ | 2039 | /******************************************************************************/ |
2040 | 2040 | ||
2041 | static int ip2_tiocmget(struct tty_struct *tty, struct file *file) | 2041 | static int ip2_tiocmget(struct tty_struct *tty) |
2042 | { | 2042 | { |
2043 | i2ChanStrPtr pCh = DevTable[tty->index]; | 2043 | i2ChanStrPtr pCh = DevTable[tty->index]; |
2044 | #ifdef ENABLE_DSSNOW | 2044 | #ifdef ENABLE_DSSNOW |