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/moxa.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/moxa.c')
-rw-r--r-- | drivers/char/moxa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 107b0bd58d19..fdf069bb702f 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
@@ -199,7 +199,7 @@ static void moxa_set_termios(struct tty_struct *, struct ktermios *); | |||
199 | static void moxa_stop(struct tty_struct *); | 199 | static void moxa_stop(struct tty_struct *); |
200 | static void moxa_start(struct tty_struct *); | 200 | static void moxa_start(struct tty_struct *); |
201 | static void moxa_hangup(struct tty_struct *); | 201 | static void moxa_hangup(struct tty_struct *); |
202 | static int moxa_tiocmget(struct tty_struct *tty, struct file *file); | 202 | static int moxa_tiocmget(struct tty_struct *tty); |
203 | static int moxa_tiocmset(struct tty_struct *tty, struct file *file, | 203 | static int moxa_tiocmset(struct tty_struct *tty, struct file *file, |
204 | unsigned int set, unsigned int clear); | 204 | unsigned int set, unsigned int clear); |
205 | static void moxa_poll(unsigned long); | 205 | static void moxa_poll(unsigned long); |
@@ -1257,7 +1257,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty) | |||
1257 | return chars; | 1257 | return chars; |
1258 | } | 1258 | } |
1259 | 1259 | ||
1260 | static int moxa_tiocmget(struct tty_struct *tty, struct file *file) | 1260 | static int moxa_tiocmget(struct tty_struct *tty) |
1261 | { | 1261 | { |
1262 | struct moxa_port *ch = tty->driver_data; | 1262 | struct moxa_port *ch = tty->driver_data; |
1263 | int flag = 0, dtr, rts; | 1263 | int flag = 0, dtr, rts; |