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>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index fde5a4dae3dd..83af24ca1e5e 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2481,7 +2481,6 @@ static int tty_tiocmget(struct tty_struct *tty, int __user *p)
 /**
  *      tty_tiocmset            -       set modem status
  *      @tty: tty device
- *      @file: user file pointer
  *      @cmd: command - clear bits, set bits or set all
  *      @p: pointer to desired bits
  *
@@ -2491,7 +2490,7 @@ static int tty_tiocmget(struct tty_struct *tty, int __user *p)
  *      Locking: none (up to the driver)
  */
 
-static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,
+static int tty_tiocmset(struct tty_struct *tty, unsigned int cmd,
              unsigned __user *p)
 {
         int retval;
@@ -2518,7 +2517,7 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int
         }
         set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
         clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-        return tty->ops->tiocmset(tty, file, set, clear);
+        return tty->ops->tiocmset(tty, set, clear);
 }
 
 static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
@@ -2659,7 +2658,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case TIOCMSET:
         case TIOCMBIC:
         case TIOCMBIS:
-                return tty_tiocmset(tty, file, cmd, p);
+                return tty_tiocmset(tty, cmd, p);
         case TIOCGICOUNT:
                 retval = tty_tiocgicount(tty, p);
                 /* For the moment allow fall through to the old method */