drivers:s390: use setup_timer
Subsystems (3)
PATCH 1/1 drivers:s390: use setup_timer
Use setup_timer function instead of initializing timer with the function and data fields.
Signed-off-by Allen Pais <[email protected]>
--- drivers/s390/net/fsm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/s390/net/fsm.c +2 -6
@@ -170,9 +170,7 @@ fsm_addtimer(fsm_timer *this, int millisec, int event, void *arg) this->fi->name, this, millisec);#endif -init_timer (&this->tl); - this->tl.function = (void *)fsm_expire_timer; - this->tl.data = (long )this; +setup_timer (&this->tl, (void *)fsm_expire_timer, (long )this); this->expire_event = event; this->event_arg = arg; this->tl.expires = jiffies + (millisec *HZ ) /1000 ;
@@ -191,9 +189,7 @@ fsm_modtimer(fsm_timer *this, int millisec, int event, void *arg)#endif del_timer (&this->tl); -init_timer (&this->tl); - this->tl.function = (void *)fsm_expire_timer; - this->tl.data = (long )this; +setup_timer (&this->tl, (void *)fsm_expire_timer, (long )this); this->expire_event = event; this->event_arg = arg; this->tl.expires = jiffies + (millisec *HZ ) /1000 ;
Signature · 1 line
2.7.4
Quoted 4 lines · Allen Pais
Use
setup_timerfunction instead of initializing timer with the function and data fields.Signed-off-by Allen Pais <[email protected]>
Thanks Allen, queued up for our next upstream submission.