tty: remove file from n_tty_ioctl_helper

After the previous patch, there are no users of 'file' in
n_tty_ioctl_helper. So remove it also from there.

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210914091134.17426-6-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 5ed2cfa7da1d9e116198f3742ef29d53cb4128cb..824d1c7e3e53726e41151b5c7ac0b0db9d9a9857 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -790,7 +790,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file *file,
                break;
 
        default:
-               err = n_tty_ioctl_helper(tty, file, cmd, arg);
+               err = n_tty_ioctl_helper(tty, cmd, arg);
                break;
        }
 

diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index 6492523fc234858074d814f2d42655e022b00f0a..f4429b93a9c84c7c6764b21a55d3d6fe3293a4cf 100644 (file)
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -310,7 +310,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
                /* flush our buffers and the serial port's buffer */
                if (arg == TCIOFLUSH || arg == TCOFLUSH)
                        ppp_async_flush_output(ap);
-               err = n_tty_ioctl_helper(tty, file, cmd, arg);
+               err = n_tty_ioctl_helper(tty, cmd, arg);
                break;
 
        case FIONREAD:

diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index ebbfea0e1140b274ffd68b48baa8e209071223c0..b3a71b409a800f2b705cd63c13ece994f55bb54a 100644 (file)
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -303,7 +303,7 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
                /* flush our buffers and the serial port's buffer */
                if (arg == TCIOFLUSH || arg == TCOFLUSH)
                        ppp_sync_flush_output(ap);
-               err = n_tty_ioctl_helper(tty, file, cmd, arg);
+               err = n_tty_ioctl_helper(tty, cmd, arg);
                break;
 
        case FIONREAD:

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 157b51ce9cc06607506db55b74a42b99612d932e..c98a04595084ed2efd555c66c42cf1ca8493a4e7 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2712,7 +2712,7 @@ static int gsmld_ioctl(struct tty_struct *tty, struct file *file,
                base = mux_num_to_base(gsm);
                return put_user(base + 1, (__u32 __user *)arg);
        default:
-               return n_tty_ioctl_helper(tty, file, cmd, arg);
+               return n_tty_ioctl_helper(tty, cmd, arg);
        }
 }
 

diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 580a37b3fe1b9bc7d3dfce0d656e49aec5e58d29..7e0884ecc74f522ba7ac1a9a7198e8977daf582c 100644 (file)
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -630,7 +630,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
                fallthrough;    /* to default */
 
        default:
-               error = n_tty_ioctl_helper(tty, file, cmd, arg);
+               error = n_tty_ioctl_helper(tty, cmd, arg);
                break;
        }
        return error;

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 797af5d46cbe9107e9f2fcfc8ab49a73f2c802cd..5be6d02dc690b17a8420d2c3caa2f37d6144468f 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -2418,7 +2418,7 @@ static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                up_write(&tty->termios_rwsem);
                return put_user(retval, (unsigned int __user *) arg);
        default:
-               return n_tty_ioctl_helper(tty, file, cmd, arg);
+               return n_tty_ioctl_helper(tty, cmd, arg);
        }
 }
 

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 99a29d72d2943eb08f56d44fb0b9269694d3fc50..63181925ec1ae51d3300b91b548f089bcb745ee2 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -854,8 +854,8 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
 }
 EXPORT_SYMBOL_GPL(tty_perform_flush);
 
-int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
-                      unsigned int cmd, unsigned long arg)
+int n_tty_ioctl_helper(struct tty_struct *tty, unsigned int cmd,
+               unsigned long arg)
 {
        int retval;
 

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 5e73f577c2b4f5a0fcb7ecafb97b191d67d616f6..5dbd7c5afac7602055ada694601e4fe267d18f8a 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -407,8 +407,8 @@ static inline int tty_audit_push(void)
 #endif
 
 /* tty_ioctl.c */
-int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
-               unsigned int cmd, unsigned long arg);
+int n_tty_ioctl_helper(struct tty_struct *tty, unsigned int cmd,
+               unsigned long arg);
 
 /* vt.c */
 

diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 502e7a3f8948b6564f56bf19b412fd6143f67e1c..9bdd9a7d187eccc99d4f889f0104f9f833a24503 100644 (file)
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -349,7 +349,7 @@ static int nci_uart_tty_ioctl(struct tty_struct *tty, struct file *file,
                        return -EBUSY;
                break;
        default:
-               err = n_tty_ioctl_helper(tty, file, cmd, arg);
+               err = n_tty_ioctl_helper(tty, cmd, arg);
                break;
        }