On 11/24/2017 01:50 PM, Colin King wrote:
> From: Colin Ian King <colin.k...@canonical.com>
>
> Use setup_timer function instead of initializing timer with the
> function and data fields.
>
> Signed-off-by: Colin Ian King <colin.k...@canonical.com>
> ---
> drivers/s390/net/fsm.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c
> index 8c14c6c3ad3d..16b81be1f07a 100644
> --- a/drivers/s390/net/fsm.c
> +++ b/drivers/s390/net/fsm.c
> @@ -142,13 +142,11 @@ void
> fsm_settimer(fsm_instance *fi, fsm_timer *this)
> {
> this->fi = fi;
> - this->tl.function = (void *)fsm_expire_timer;
> - this->tl.data = (long)this;
> #if FSM_TIMER_DEBUG
> printk(KERN_DEBUG "fsm(%s): Create timer %p\n", fi->name,
> this);
> #endif
> - init_timer(&this->tl);
> + setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this);
> }
>
> void
>
Thanks Colin, but looks like Kees beat you to it in Linus' tree.
