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/net/wan | |
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/net/wan')
-rw-r--r-- | drivers/net/wan/pc300_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index 515d9b8af01e..d999e54a7730 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c | |||
@@ -133,7 +133,7 @@ static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char); | |||
133 | 133 | ||
134 | static int pc300_tiocmset(struct tty_struct *, struct file *, | 134 | static int pc300_tiocmset(struct tty_struct *, struct file *, |
135 | unsigned int, unsigned int); | 135 | unsigned int, unsigned int); |
136 | static int pc300_tiocmget(struct tty_struct *, struct file *); | 136 | static int pc300_tiocmget(struct tty_struct *); |
137 | 137 | ||
138 | /* functions called by PC300 driver */ | 138 | /* functions called by PC300 driver */ |
139 | void cpc_tty_init(pc300dev_t *dev); | 139 | void cpc_tty_init(pc300dev_t *dev); |
@@ -570,7 +570,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file, | |||
570 | return 0; | 570 | return 0; |
571 | } | 571 | } |
572 | 572 | ||
573 | static int pc300_tiocmget(struct tty_struct *tty, struct file *file) | 573 | static int pc300_tiocmget(struct tty_struct *tty) |
574 | { | 574 | { |
575 | unsigned int result; | 575 | unsigned int result; |
576 | unsigned char status; | 576 | unsigned char status; |