Commit 7c783601 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210914091134.17426-6-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dcc223e8

drivers/bluetooth/hci_ldisc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/ppp/ppp_async.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/net/ppp/ppp_synctty.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/tty/n_gsm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/tty/n_hdlc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;