Commit dbb27af9 authored by Allen Pais's avatar Allen Pais Committed by David S. Miller

s390/drivers: use setup_timer

Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: default avatarAllen Pais <allen.lkml@gmail.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce344356
...@@ -170,9 +170,7 @@ fsm_addtimer(fsm_timer *this, int millisec, int event, void *arg) ...@@ -170,9 +170,7 @@ fsm_addtimer(fsm_timer *this, int millisec, int event, void *arg)
this->fi->name, this, millisec); this->fi->name, this, millisec);
#endif #endif
init_timer(&this->tl); setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this);
this->tl.function = (void *)fsm_expire_timer;
this->tl.data = (long)this;
this->expire_event = event; this->expire_event = event;
this->event_arg = arg; this->event_arg = arg;
this->tl.expires = jiffies + (millisec * HZ) / 1000; this->tl.expires = jiffies + (millisec * HZ) / 1000;
...@@ -191,9 +189,7 @@ fsm_modtimer(fsm_timer *this, int millisec, int event, void *arg) ...@@ -191,9 +189,7 @@ fsm_modtimer(fsm_timer *this, int millisec, int event, void *arg)
#endif #endif
del_timer(&this->tl); del_timer(&this->tl);
init_timer(&this->tl); setup_timer(&this->tl, (void *)fsm_expire_timer, (long)this);
this->tl.function = (void *)fsm_expire_timer;
this->tl.data = (long)this;
this->expire_event = event; this->expire_event = event;
this->event_arg = arg; this->event_arg = arg;
this->tl.expires = jiffies + (millisec * HZ) / 1000; this->tl.expires = jiffies + (millisec * HZ) / 1000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment