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@xxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Jiri Slaby <jslaby@xxxxxxxx>
> Cc: linux-metag@xxxxxxxxxxxxxxx
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Looks good to me and seems to work.
Acked-by: James Hogan <jhogan@xxxxxxxxxx>
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:
signature.asc
Description: Digital signature
