aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/synclinkmp.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 11:26:14 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:47:33 -0500
commit60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch)
tree379340a7ab563df42ddb2907be6f282202244077 /drivers/char/synclinkmp.c
parentadf9251fe9b87b5a50deebe489db2df8df4715fc (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/synclinkmp.c')
-rw-r--r--drivers/char/synclinkmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 2f9eb4b0dec1..5900213ae75b 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -546,7 +546,7 @@ static int tx_abort(SLMP_INFO *info);
546static int rx_enable(SLMP_INFO *info, int enable); 546static int rx_enable(SLMP_INFO *info, int enable);
547static int modem_input_wait(SLMP_INFO *info,int arg); 547static int modem_input_wait(SLMP_INFO *info,int arg);
548static int wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr); 548static int wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr);
549static int tiocmget(struct tty_struct *tty, struct file *file); 549static int tiocmget(struct tty_struct *tty);
550static int tiocmset(struct tty_struct *tty, struct file *file, 550static int tiocmset(struct tty_struct *tty, struct file *file,
551 unsigned int set, unsigned int clear); 551 unsigned int set, unsigned int clear);
552static int set_break(struct tty_struct *tty, int break_state); 552static int set_break(struct tty_struct *tty, int break_state);
@@ -3207,7 +3207,7 @@ static int modem_input_wait(SLMP_INFO *info,int arg)
3207 3207
3208/* return the state of the serial control and status signals 3208/* return the state of the serial control and status signals
3209 */ 3209 */
3210static int tiocmget(struct tty_struct *tty, struct file *file) 3210static int tiocmget(struct tty_struct *tty)
3211{ 3211{
3212 SLMP_INFO *info = tty->driver_data; 3212 SLMP_INFO *info = tty->driver_data;
3213 unsigned int result; 3213 unsigned int result;