From: James Hogan <james.hogan@mips.com>
To: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
linux-metag@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tty: metag_da: Convert timers to use timer_setup()
Date: Tue, 17 Oct 2017 13:12:27 +0100 [thread overview]
Message-ID: <20171017121226.GN15235@jhogan-linux> (raw)
In-Reply-To: <20171016232836.GA101212@beast>
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
On Mon, Oct 16, 2017 at 04:28:36PM -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.
>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jslaby@suse.com>
> Cc: linux-metag@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Looks good to me and seems to work.
Acked-by: James Hogan <jhogan@kernel.org>
Cheers
James
> ---
> drivers/tty/metag_da.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c
> index 25ccef2fe748..82ccf3982b25 100644
> --- a/drivers/tty/metag_da.c
> +++ b/drivers/tty/metag_da.c
> @@ -309,7 +309,7 @@ static int put_data(void *arg)
> /*
> * This gets called every DA_TTY_POLL and polls the channels for data
> */
> -static void dashtty_timer(unsigned long ignored)
> +static void dashtty_timer(struct timer_list *poll_timer)
> {
> int channel;
>
> @@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored)
> if (channel >= 0)
> fetch_data(channel);
>
> - mod_timer(&poll_timer, jiffies + DA_TTY_POLL);
> + mod_timer(poll_timer, jiffies + DA_TTY_POLL);
> }
>
> static void add_poll_timer(struct timer_list *poll_timer)
> {
> - setup_pinned_timer(poll_timer, dashtty_timer, 0);
> + timer_setup(poll_timer, dashtty_timer, TIMER_PINNED);
> poll_timer->expires = jiffies + DA_TTY_POLL;
>
> /*
> @@ -461,7 +461,7 @@ static void dashtty_hangup(struct tty_struct *tty)
> * buffers. It is used to delay the expensive writeout until the writer has
> * stopped writing.
> */
> -static void dashtty_put_timer(unsigned long ignored)
> +static void dashtty_put_timer(struct timer_list *unused)
> {
> if (atomic_read(&dashtty_xmit_cnt))
> wake_up_interruptible(&dashtty_waitqueue);
> @@ -603,7 +603,7 @@ static int __init dashtty_init(void)
> complete(&dport->xmit_empty);
> }
>
> - setup_timer(&put_timer, dashtty_put_timer, 0);
> + timer_setup(&put_timer, dashtty_put_timer, 0);
>
> init_waitqueue_head(&dashtty_waitqueue);
> dashtty_thread = kthread_create(put_data, NULL, "ttyDA");
> --
> 2.7.4
>
>
> --
> Kees Cook
> Pixel Security
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@mips.com>
To: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, <linux-metag@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] tty: metag_da: Convert timers to use timer_setup()
Date: Tue, 17 Oct 2017 13:12:27 +0100 [thread overview]
Message-ID: <20171017121226.GN15235@jhogan-linux> (raw)
In-Reply-To: <20171016232836.GA101212@beast>
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
On Mon, Oct 16, 2017 at 04:28:36PM -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.
>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jslaby@suse.com>
> Cc: linux-metag@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Looks good to me and seems to work.
Acked-by: James Hogan <jhogan@kernel.org>
Cheers
James
> ---
> drivers/tty/metag_da.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c
> index 25ccef2fe748..82ccf3982b25 100644
> --- a/drivers/tty/metag_da.c
> +++ b/drivers/tty/metag_da.c
> @@ -309,7 +309,7 @@ static int put_data(void *arg)
> /*
> * This gets called every DA_TTY_POLL and polls the channels for data
> */
> -static void dashtty_timer(unsigned long ignored)
> +static void dashtty_timer(struct timer_list *poll_timer)
> {
> int channel;
>
> @@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored)
> if (channel >= 0)
> fetch_data(channel);
>
> - mod_timer(&poll_timer, jiffies + DA_TTY_POLL);
> + mod_timer(poll_timer, jiffies + DA_TTY_POLL);
> }
>
> static void add_poll_timer(struct timer_list *poll_timer)
> {
> - setup_pinned_timer(poll_timer, dashtty_timer, 0);
> + timer_setup(poll_timer, dashtty_timer, TIMER_PINNED);
> poll_timer->expires = jiffies + DA_TTY_POLL;
>
> /*
> @@ -461,7 +461,7 @@ static void dashtty_hangup(struct tty_struct *tty)
> * buffers. It is used to delay the expensive writeout until the writer has
> * stopped writing.
> */
> -static void dashtty_put_timer(unsigned long ignored)
> +static void dashtty_put_timer(struct timer_list *unused)
> {
> if (atomic_read(&dashtty_xmit_cnt))
> wake_up_interruptible(&dashtty_waitqueue);
> @@ -603,7 +603,7 @@ static int __init dashtty_init(void)
> complete(&dport->xmit_empty);
> }
>
> - setup_timer(&put_timer, dashtty_put_timer, 0);
> + timer_setup(&put_timer, dashtty_put_timer, 0);
>
> init_waitqueue_head(&dashtty_waitqueue);
> dashtty_thread = kthread_create(put_data, NULL, "ttyDA");
> --
> 2.7.4
>
>
> --
> Kees Cook
> Pixel Security
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-10-17 12:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 23:28 [PATCH] tty: metag_da: Convert timers to use timer_setup() Kees Cook
2017-10-17 12:12 ` James Hogan [this message]
2017-10-17 12:12 ` James Hogan
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=20171017121226.GN15235@jhogan-linux \
--to=james.hogan@mips.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
/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.