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

tty: remove file from tty_ldisc_ops::ioctl and compat_ioctl 



After the previous patches, noone needs 'file' parameter in neither
ioctl hook from tty_ldisc_ops. So remove 'file' from both of them.

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> [NFC]
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211122094529.24171-1-jslaby@suse.cz


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

drivers/bluetooth/hci_ldisc.c

+2 −3
Original line number Diff line number Diff line
@@ -739,14 +739,13 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags) 
 * Arguments:

 *

 *    tty        pointer to tty instance data

 *    file       pointer to open file object for device

 *    cmd        IOCTL command code

 *    arg        argument for IOCTL call (cmd dependent)

 *

 * Return Value:    Command dependent

 */

static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file *file,

			      unsigned int cmd, unsigned long arg)

static int hci_uart_tty_ioctl(struct tty_struct *tty, unsigned int cmd,

			      unsigned long arg)

{

	struct hci_uart *hu = tty->disc_data;

	int err = 0;

drivers/input/serio/serport.c

+2 −3
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ static void serport_set_type(struct tty_struct *tty, unsigned long type) 
 * serport_ldisc_ioctl() allows to set the port protocol, and device ID

 */



static int serport_ldisc_ioctl(struct tty_struct *tty, struct file *file,

			       unsigned int cmd, unsigned long arg)

static int serport_ldisc_ioctl(struct tty_struct *tty, unsigned int cmd,

			       unsigned long arg)

{

	if (cmd == SPIOCSTYPE) {

		unsigned long type;
@@ -226,7 +226,6 @@ static int serport_ldisc_ioctl(struct tty_struct *tty, struct file *file, 
#ifdef CONFIG_COMPAT

#define COMPAT_SPIOCSTYPE	_IOW('q', 0x01, compat_ulong_t)

static int serport_ldisc_compat_ioctl(struct tty_struct *tty,

				       struct file *file,

				       unsigned int cmd, unsigned long arg)

{

	if (cmd == COMPAT_SPIOCSTYPE) {

drivers/net/can/slcan.c

+2 −2
Original line number Diff line number Diff line
@@ -670,8 +670,8 @@ static void slcan_hangup(struct tty_struct *tty) 
}



/* Perform I/O control on an active SLCAN channel. */

static int slcan_ioctl(struct tty_struct *tty, struct file *file,

		       unsigned int cmd, unsigned long arg)

static int slcan_ioctl(struct tty_struct *tty, unsigned int cmd,

		       unsigned long arg)

{

	struct slcan *sl = (struct slcan *) tty->disc_data;

	unsigned int tmp;

drivers/net/hamradio/6pack.c

+2 −2
Original line number Diff line number Diff line
@@ -681,8 +681,8 @@ static void sixpack_close(struct tty_struct *tty) 
}



/* Perform I/O control on an active 6pack channel. */

static int sixpack_ioctl(struct tty_struct *tty, struct file *file,

	unsigned int cmd, unsigned long arg)

static int sixpack_ioctl(struct tty_struct *tty, unsigned int cmd,

		unsigned long arg)

{

	struct sixpack *sp = sp_get(tty);

	struct net_device *dev;

drivers/net/hamradio/mkiss.c

+2 −2
Original line number Diff line number Diff line
@@ -804,8 +804,8 @@ static void mkiss_close(struct tty_struct *tty) 
}



/* Perform I/O control on an active ax25 channel. */

static int mkiss_ioctl(struct tty_struct *tty, struct file *file,

	unsigned int cmd, unsigned long arg)

static int mkiss_ioctl(struct tty_struct *tty, unsigned int cmd,

		unsigned long arg)

{

	struct mkiss *ax = mkiss_get(tty);

	struct net_device *dev;