From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>, Vignesh R <vigneshr@ti.com>,
Ed Blake <ed.blake@imgtec.com>,
Matthias Brugger <mbrugger@suse.com>, Sean Young <sean@mess.org>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] serial: 8250: Convert timers to use timer_setup()
Date: Thu, 26 Oct 2017 19:22:11 +0300 [thread overview]
Message-ID: <1509034931.10233.3.camel@linux.intel.com> (raw)
In-Reply-To: <20171024095917.GA67790@beast>
On Tue, 2017-10-24 at 02:59 -0700, Kees Cook wrote:
> In preparation for unconditionally passing the struct timer_list
> pointer to
> all timer callbacks, switch to using the new timer_setup() and
> from_timer()
> to pass the timer pointer explicitly.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jslaby@suse.com>
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: Vignesh R <vigneshr@ti.com>
> Cc: Ed Blake <ed.blake@imgtec.com>
> Cc: Matthias Brugger <mbrugger@suse.com>
> Cc: Sean Young <sean@mess.org>
> Cc: linux-serial@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/tty/serial/8250/8250_core.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_core.c
> b/drivers/tty/serial/8250/8250_core.c
> index 00d4b114f1bf..ccfc42ca846d 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -262,17 +262,17 @@ static void serial_unlink_irq_chain(struct
> uart_8250_port *up)
> * barely passable results for a 16550A. (Although at the expense
> * of much CPU overhead).
> */
> -static void serial8250_timeout(unsigned long data)
> +static void serial8250_timeout(struct timer_list *t)
> {
> - struct uart_8250_port *up = (struct uart_8250_port *)data;
> + struct uart_8250_port *up = from_timer(up, t, timer);
>
> up->port.handle_irq(&up->port);
> mod_timer(&up->timer, jiffies + uart_poll_timeout(&up-
> >port));
> }
>
> -static void serial8250_backup_timeout(unsigned long data)
> +static void serial8250_backup_timeout(struct timer_list *t)
> {
> - struct uart_8250_port *up = (struct uart_8250_port *)data;
> + struct uart_8250_port *up = from_timer(up, t, timer);
> unsigned int iir, ier = 0, lsr;
> unsigned long flags;
>
> @@ -329,8 +329,7 @@ static int univ8250_setup_irq(struct
> uart_8250_port *up)
> if (up->bugs & UART_BUG_THRE) {
> pr_debug("ttyS%d - using backup timer\n",
> serial_index(port));
>
> - up->timer.function = serial8250_backup_timeout;
> - up->timer.data = (unsigned long)up;
> + up->timer.function =
> (TIMER_FUNC_TYPE)serial8250_backup_timeout;
> mod_timer(&up->timer, jiffies +
> uart_poll_timeout(port) + HZ / 5);
> }
> @@ -341,7 +340,6 @@ static int univ8250_setup_irq(struct
> uart_8250_port *up)
> * driver used to do this with IRQ0.
> */
> if (!port->irq) {
> - up->timer.data = (unsigned long)up;
> mod_timer(&up->timer, jiffies +
> uart_poll_timeout(port));
> } else
> retval = serial_link_irq_chain(up);
> @@ -354,7 +352,7 @@ static void univ8250_release_irq(struct
> uart_8250_port *up)
> struct uart_port *port = &up->port;
>
> del_timer_sync(&up->timer);
> - up->timer.function = serial8250_timeout;
> + up->timer.function = (TIMER_FUNC_TYPE)serial8250_timeout;
> if (port->irq)
> serial_unlink_irq_chain(up);
> }
> @@ -525,7 +523,7 @@ static void __init serial8250_isa_init_ports(void)
> base_ops = port->ops;
> port->ops = &univ8250_port_ops;
>
> - setup_timer(&up->timer, serial8250_timeout, 0UL);
> + timer_setup(&up->timer, serial8250_timeout, 0);
>
> up->ops = &univ8250_driver_ops;
>
> --
> 2.7.4
>
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
prev parent reply other threads:[~2017-10-26 16:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 9:59 [PATCH] serial: 8250: Convert timers to use timer_setup() Kees Cook
2017-10-26 16:22 ` Andy Shevchenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1509034931.10233.3.camel@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=ed.blake@imgtec.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mbrugger@suse.com \
--cc=sean@mess.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.