| Message ID | 20210914091134.17426-7-jslaby@suse.cz |
|---|---|
| State | New |
| Headers | show |
| Series | [01/16] tty: unexport tty_ldisc_release | expand |
Hi Jiri, On Tue, Sep 14, 2021 at 11:11:25AM +0200, Jiri Slaby wrote: > diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c > index 17eb8f2aa48d..55e91d0e70ec 100644 > --- a/drivers/input/serio/serport.c > +++ b/drivers/input/serio/serport.c > @@ -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) Can we please keep arguments aligned as they were? Otherwise Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Thanks. -- Dmitry
On 21. 09. 21, 6:00, Dmitry Torokhov wrote: > Hi Jiri, > > On Tue, Sep 14, 2021 at 11:11:25AM +0200, Jiri Slaby wrote: >> diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c >> index 17eb8f2aa48d..55e91d0e70ec 100644 >> --- a/drivers/input/serio/serport.c >> +++ b/drivers/input/serio/serport.c >> @@ -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) > > Can we please keep arguments aligned as they were? Otherwise Fixed, thanks. Likely, I will send a follow-up -- depending if Greg drops or keeps these in the tree. -- js suse labs
On Tue, Sep 21, 2021 at 12:52:38PM +0200, Jiri Slaby wrote: > On 21. 09. 21, 6:00, Dmitry Torokhov wrote: > > Hi Jiri, > > > > On Tue, Sep 14, 2021 at 11:11:25AM +0200, Jiri Slaby wrote: > > > diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c > > > index 17eb8f2aa48d..55e91d0e70ec 100644 > > > --- a/drivers/input/serio/serport.c > > > +++ b/drivers/input/serio/serport.c > > > @@ -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) > > > > Can we please keep arguments aligned as they were? Otherwise > > Fixed, thanks. Likely, I will send a follow-up -- depending if Greg drops or > keeps these in the tree. Up to you. I can drop them all now if you want to resend a v2 with all of the aggregate acks, or you can send a follow-up set on top of these. Your choice. thanks, greg k-h
On 21. 09. 21, 13:36, Greg KH wrote: > On Tue, Sep 21, 2021 at 12:52:38PM +0200, Jiri Slaby wrote: >> On 21. 09. 21, 6:00, Dmitry Torokhov wrote: >>> Hi Jiri, >>> >>> On Tue, Sep 14, 2021 at 11:11:25AM +0200, Jiri Slaby wrote: >>>> diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c >>>> index 17eb8f2aa48d..55e91d0e70ec 100644 >>>> --- a/drivers/input/serio/serport.c >>>> +++ b/drivers/input/serio/serport.c >>>> @@ -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) >>> >>> Can we please keep arguments aligned as they were? Otherwise >> >> Fixed, thanks. Likely, I will send a follow-up -- depending if Greg drops or >> keeps these in the tree. > > Up to you. I can drop them all now if you want to resend a v2 with all > of the aggregate acks, or you can send a follow-up set on top of these. What about if you keep everything up to (and incl.) tty: remove file from n_tty_ioctl_helper (i.e. the patch 06/16, the one before this one)? If that works for you, I will send v2 of the rest w/ collected acks. If it doesn't, I prefer sending a complete v2 (incl. collected acks). thanks, -- js
On Tue, Sep 21, 2021 at 05:51:35PM +0200, Jiri Slaby wrote: > On 21. 09. 21, 13:36, Greg KH wrote: > > On Tue, Sep 21, 2021 at 12:52:38PM +0200, Jiri Slaby wrote: > > > On 21. 09. 21, 6:00, Dmitry Torokhov wrote: > > > > Hi Jiri, > > > > > > > > On Tue, Sep 14, 2021 at 11:11:25AM +0200, Jiri Slaby wrote: > > > > > diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c > > > > > index 17eb8f2aa48d..55e91d0e70ec 100644 > > > > > --- a/drivers/input/serio/serport.c > > > > > +++ b/drivers/input/serio/serport.c > > > > > @@ -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) > > > > > > > > Can we please keep arguments aligned as they were? Otherwise > > > > > > Fixed, thanks. Likely, I will send a follow-up -- depending if Greg drops or > > > keeps these in the tree. > > > > Up to you. I can drop them all now if you want to resend a v2 with all > > of the aggregate acks, or you can send a follow-up set on top of these. > > What about if you keep everything up to (and incl.) > tty: remove file from n_tty_ioctl_helper > (i.e. the patch 06/16, the one before this one)? If that works for you, I > will send v2 of the rest w/ collected acks. If it doesn't, I prefer sending > a complete v2 (incl. collected acks). Ok, I have kept everything up to and including patch 06 of this series and pushed that out now. Feel free to rebase on my tty-next branch and resend the remaining changes. thanks, greg k-h
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 824d1c7e3e53..6b5329784f17 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -736,14 +736,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; diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index 17eb8f2aa48d..55e91d0e70ec 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -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) { diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 9a4ebda30510..de2da1b09a79 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -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; diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 05404f7a3204..300731ccbd66 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -680,8 +680,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; diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 8666110bec55..1a4877abc562 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -803,8 +803,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; diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c index f4429b93a9c8..15a179631903 100644 --- a/drivers/net/ppp/ppp_async.c +++ b/drivers/net/ppp/ppp_async.c @@ -281,8 +281,7 @@ ppp_asynctty_write(struct tty_struct *tty, struct file *file, */ static int -ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +ppp_asynctty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct asyncppp *ap = ap_get(tty); int err, val; diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c index b3a71b409a80..18283b7b94bc 100644 --- a/drivers/net/ppp/ppp_synctty.c +++ b/drivers/net/ppp/ppp_synctty.c @@ -274,8 +274,7 @@ ppp_sync_write(struct tty_struct *tty, struct file *file, } static int -ppp_synctty_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +ppp_synctty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct syncppp *ap = sp_get(tty); int __user *p = (int __user *)arg; diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c index 9f3b4c1aa5ce..98f586f910fb 100644 --- a/drivers/net/slip/slip.c +++ b/drivers/net/slip/slip.c @@ -1072,8 +1072,8 @@ static void slip_unesc6(struct slip *sl, unsigned char s) #endif /* CONFIG_SLIP_MODE_SLIP6 */ /* Perform I/O control on an active SLIP channel. */ -static int slip_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int slip_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { struct slip *sl = tty->disc_data; unsigned int tmp; diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 03a98c93006a..59bbd4f6a610 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2630,8 +2630,8 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file, return mask; } -static int gsmld_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int gsmld_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { struct gsm_config c; struct gsm_mux *gsm = tty->disc_data; diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index 7e0884ecc74f..7fdbae81bf1d 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -572,14 +572,13 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, /** * n_hdlc_tty_ioctl - process IOCTL system call for the tty device. * @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) * * Returns command dependent result. */ -static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int n_hdlc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { struct n_hdlc *n_hdlc = tty->disc_data; int error = 0; diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 9fc2319a394d..011ce4a2a01a 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -2400,8 +2400,8 @@ static unsigned long inq_canon(struct n_tty_data *ldata) return nr; } -static int n_tty_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int n_tty_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { struct n_tty_data *ldata = tty->disc_data; int retval; diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 6616d4a0d41d..2f1bf1bb7710 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2811,7 +2811,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return hung_up_tty_ioctl(file, cmd, arg); retval = -EINVAL; if (ld->ops->ioctl) { - retval = ld->ops->ioctl(tty, file, cmd, arg); + retval = ld->ops->ioctl(tty, cmd, arg); if (retval == -ENOIOCTLCMD) retval = -ENOTTY; } @@ -2990,10 +2990,10 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, if (!ld) return hung_up_tty_compat_ioctl(file, cmd, arg); if (ld->ops->compat_ioctl) - retval = ld->ops->compat_ioctl(tty, file, cmd, arg); + retval = ld->ops->compat_ioctl(tty, cmd, arg); if (retval == -ENOIOCTLCMD && ld->ops->ioctl) - retval = ld->ops->ioctl(tty, file, - (unsigned long)compat_ptr(cmd), arg); + retval = ld->ops->ioctl(tty, (unsigned long)compat_ptr(cmd), + arg); tty_ldisc_deref(ld); return retval; diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h index b85d84fb5f49..25f07017bbad 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h @@ -45,8 +45,7 @@ struct tty_struct; * some processing on the characters first. If this function is * not defined, the user will receive an EIO error. * - * int (*ioctl)(struct tty_struct * tty, struct file * file, - * unsigned int cmd, unsigned long arg); + * int (*ioctl)(struct tty_struct *tty, unsigned int cmd, unsigned long arg); * * This function is called when the user requests an ioctl which * is not handled by the tty layer or the low-level tty driver. @@ -56,8 +55,8 @@ struct tty_struct; * low-level driver can "grab" an ioctl request before the line * discpline has a chance to see it. * - * int (*compat_ioctl)(struct tty_struct * tty, struct file * file, - * unsigned int cmd, unsigned long arg); + * int (*compat_ioctl)(struct tty_struct *tty, unsigned int cmd, + * unsigned long arg); * * Process ioctl calls from 32-bit process on 64-bit system * @@ -192,10 +191,10 @@ struct tty_ldisc_ops { void **cookie, unsigned long offset); ssize_t (*write)(struct tty_struct *tty, struct file *file, const unsigned char *buf, size_t nr); - int (*ioctl)(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg); - int (*compat_ioctl)(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg); + int (*ioctl)(struct tty_struct *tty, unsigned int cmd, + unsigned long arg); + int (*compat_ioctl)(struct tty_struct *tty, unsigned int cmd, + unsigned long arg); void (*set_termios)(struct tty_struct *tty, struct ktermios *old); __poll_t (*poll)(struct tty_struct *, struct file *, struct poll_table_struct *); diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index 9bdd9a7d187e..17e29c8b28de 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -329,14 +329,13 @@ static void nci_uart_tty_receive(struct tty_struct *tty, const u8 *data, * 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 nci_uart_tty_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int nci_uart_tty_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { struct nci_uart *nu = (void *)tty->disc_data; int err = 0;
After the previous patches, noone needs 'file' parameter in neither ioctl hook from tty_ldisc_ops. So remove 'file' from both of them. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com> Cc: Dmitry Torokhov <dmitry.torokhov@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> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/bluetooth/hci_ldisc.c | 5 ++--- drivers/input/serio/serport.c | 5 ++--- drivers/net/can/slcan.c | 4 ++-- drivers/net/hamradio/6pack.c | 4 ++-- drivers/net/hamradio/mkiss.c | 4 ++-- drivers/net/ppp/ppp_async.c | 3 +-- drivers/net/ppp/ppp_synctty.c | 3 +-- drivers/net/slip/slip.c | 4 ++-- drivers/tty/n_gsm.c | 4 ++-- drivers/tty/n_hdlc.c | 5 ++--- drivers/tty/n_tty.c | 4 ++-- drivers/tty/tty_io.c | 8 ++++---- include/linux/tty_ldisc.h | 15 +++++++-------- net/nfc/nci/uart.c | 5 ++--- 14 files changed, 33 insertions(+), 40 deletions(-)