mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Jiri Slaby 2021-09-14 11:11:24 +02:00 committed by Greg Kroah-Hartman
parent dcc223e8b9
commit 7c783601a3
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bluetooth/hci_ldisc.c
View File

@ -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;
}

2
drivers/net/ppp/ppp_async.c
View File

@ -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:

2
drivers/net/ppp/ppp_synctty.c
View File

@ -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:

2
drivers/tty/n_gsm.c
View File

@ -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);
}
}

2
drivers/tty/n_hdlc.c
View File

@ -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;

2
drivers/tty/n_tty.c
View File

@ -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);
}
}

4
drivers/tty/tty_ioctl.c
View File

@ -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;

4
include/linux/tty.h
View File

@ -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 */

2
net/nfc/nci/uart.c
View File

@ -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;
}