mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] s390/drivers: use setup_timer instead of init_timer
@ 2017-11-24 12:50 Colin King
  2017-11-27  7:25 ` Julian Wiedmann
  0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2017-11-24 12:50 UTC (permalink / raw)
  To: Julian Wiedmann, Ursula Braun, Martin Schwidefsky,
	Heiko Carstens, linux-s390
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

Use setup_timer function instead of initializing timer with the
function and data fields.

Signed-off-by: Colin Ian King <colin.king@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
-- 
2.14.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] s390/drivers: use setup_timer instead of init_timer
  2017-11-24 12:50 [PATCH] s390/drivers: use setup_timer instead of init_timer Colin King
@ 2017-11-27  7:25 ` Julian Wiedmann
  0 siblings, 0 replies; 2+ messages in thread
From: Julian Wiedmann @ 2017-11-27  7:25 UTC (permalink / raw)
  To: Colin King, Ursula Braun, Martin Schwidefsky, Heiko Carstens, linux-s390
  Cc: kernel-janitors, linux-kernel

On 11/24/2017 01:50 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Use setup_timer function instead of initializing timer with the
> function and data fields.
> 
> Signed-off-by: Colin Ian King <colin.king@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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-27  7:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-24 12:50 [PATCH] s390/drivers: use setup_timer instead of init_timer Colin King
2017-11-27  7:25 ` Julian Wiedmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®