Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Slaby and committed by
Greg Kroah-Hartman
7c783601 dcc223e8

+11 -11
+1 -1
drivers/bluetooth/hci_ldisc.c
··· 790 790 break; 791 791 792 792 default: 793 - err = n_tty_ioctl_helper(tty, file, cmd, arg); 793 + err = n_tty_ioctl_helper(tty, cmd, arg); 794 794 break; 795 795 } 796 796
+1 -1
drivers/net/ppp/ppp_async.c
··· 310 310 /* flush our buffers and the serial port's buffer */ 311 311 if (arg == TCIOFLUSH || arg == TCOFLUSH) 312 312 ppp_async_flush_output(ap); 313 - err = n_tty_ioctl_helper(tty, file, cmd, arg); 313 + err = n_tty_ioctl_helper(tty, cmd, arg); 314 314 break; 315 315 316 316 case FIONREAD:
+1 -1
drivers/net/ppp/ppp_synctty.c
··· 303 303 /* flush our buffers and the serial port's buffer */ 304 304 if (arg == TCIOFLUSH || arg == TCOFLUSH) 305 305 ppp_sync_flush_output(ap); 306 - err = n_tty_ioctl_helper(tty, file, cmd, arg); 306 + err = n_tty_ioctl_helper(tty, cmd, arg); 307 307 break; 308 308 309 309 case FIONREAD:
+1 -1
drivers/tty/n_gsm.c
··· 2712 2712 base = mux_num_to_base(gsm); 2713 2713 return put_user(base + 1, (__u32 __user *)arg); 2714 2714 default: 2715 - return n_tty_ioctl_helper(tty, file, cmd, arg); 2715 + return n_tty_ioctl_helper(tty, cmd, arg); 2716 2716 } 2717 2717 } 2718 2718
+1 -1
drivers/tty/n_hdlc.c
··· 630 630 fallthrough; /* to default */ 631 631 632 632 default: 633 - error = n_tty_ioctl_helper(tty, file, cmd, arg); 633 + error = n_tty_ioctl_helper(tty, cmd, arg); 634 634 break; 635 635 } 636 636 return error;
+1 -1
drivers/tty/n_tty.c
··· 2418 2418 up_write(&tty->termios_rwsem); 2419 2419 return put_user(retval, (unsigned int __user *) arg); 2420 2420 default: 2421 - return n_tty_ioctl_helper(tty, file, cmd, arg); 2421 + return n_tty_ioctl_helper(tty, cmd, arg); 2422 2422 } 2423 2423 } 2424 2424
+2 -2
drivers/tty/tty_ioctl.c
··· 854 854 } 855 855 EXPORT_SYMBOL_GPL(tty_perform_flush); 856 856 857 - int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file, 858 - unsigned int cmd, unsigned long arg) 857 + int n_tty_ioctl_helper(struct tty_struct *tty, unsigned int cmd, 858 + unsigned long arg) 859 859 { 860 860 int retval; 861 861
+2 -2
include/linux/tty.h
··· 407 407 #endif 408 408 409 409 /* tty_ioctl.c */ 410 - int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file, 411 - unsigned int cmd, unsigned long arg); 410 + int n_tty_ioctl_helper(struct tty_struct *tty, unsigned int cmd, 411 + unsigned long arg); 412 412 413 413 /* vt.c */ 414 414
+1 -1
net/nfc/nci/uart.c
··· 349 349 return -EBUSY; 350 350 break; 351 351 default: 352 - err = n_tty_ioctl_helper(tty, file, cmd, arg); 352 + err = n_tty_ioctl_helper(tty, cmd, arg); 353 353 break; 354 354 } 355 355