diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:52:43 -0500 |
commit | 20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch) | |
tree | 64e9c4ff845844298f9056357d9f4914802207f8 /drivers/isdn | |
parent | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (diff) |
tiocmset: kill the file pointer argument
Doing tiocmget was such fun we should do tiocmset as well for the same
reasons
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 4 | ||||
-rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 2 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index e1a7c14f5f1d..9b2bb491c614 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -123,7 +123,7 @@ static void if_throttle(struct tty_struct *tty); | |||
123 | static void if_unthrottle(struct tty_struct *tty); | 123 | static void if_unthrottle(struct tty_struct *tty); |
124 | static void if_set_termios(struct tty_struct *tty, struct ktermios *old); | 124 | static void if_set_termios(struct tty_struct *tty, struct ktermios *old); |
125 | static int if_tiocmget(struct tty_struct *tty); | 125 | static int if_tiocmget(struct tty_struct *tty); |
126 | static int if_tiocmset(struct tty_struct *tty, struct file *file, | 126 | static int if_tiocmset(struct tty_struct *tty, |
127 | unsigned int set, unsigned int clear); | 127 | unsigned int set, unsigned int clear); |
128 | static int if_write(struct tty_struct *tty, | 128 | static int if_write(struct tty_struct *tty, |
129 | const unsigned char *buf, int count); | 129 | const unsigned char *buf, int count); |
@@ -303,7 +303,7 @@ static int if_tiocmget(struct tty_struct *tty) | |||
303 | return retval; | 303 | return retval; |
304 | } | 304 | } |
305 | 305 | ||
306 | static int if_tiocmset(struct tty_struct *tty, struct file *file, | 306 | static int if_tiocmset(struct tty_struct *tty, |
307 | unsigned int set, unsigned int clear) | 307 | unsigned int set, unsigned int clear) |
308 | { | 308 | { |
309 | struct cardstate *cs; | 309 | struct cardstate *cs; |
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 0ef09d0eb96b..86a5c4f7775e 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
@@ -440,7 +440,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state, | |||
440 | if (!set && !clear) | 440 | if (!set && !clear) |
441 | return 0; | 441 | return 0; |
442 | gig_dbg(DEBUG_IF, "tiocmset set %x clear %x", set, clear); | 442 | gig_dbg(DEBUG_IF, "tiocmset set %x clear %x", set, clear); |
443 | return tty->ops->tiocmset(tty, NULL, set, clear); | 443 | return tty->ops->tiocmset(tty, set, clear); |
444 | } | 444 | } |
445 | 445 | ||
446 | static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag) | 446 | static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag) |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index ba6c2f124b58..0341c69eb152 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmget(struct tty_struct *tty) | |||
1372 | } | 1372 | } |
1373 | 1373 | ||
1374 | static int | 1374 | static int |
1375 | isdn_tty_tiocmset(struct tty_struct *tty, struct file *file, | 1375 | isdn_tty_tiocmset(struct tty_struct *tty, |
1376 | unsigned int set, unsigned int clear) | 1376 | unsigned int set, unsigned int clear) |
1377 | { | 1377 | { |
1378 | modem_info *info = (modem_info *) tty->driver_data; | 1378 | modem_info *info = (modem_info *) tty->driver_data; |