diff options
| author | Allen Pais <allen.lkml@gmail.com> | 2017-10-18 17:40:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-20 14:11:04 +0200 |
| commit | dbb27af91d2afd820c7cb5fab9b7608225e22fea (patch) | |
| tree | 932890ea6cca2fd2047f11bed6531931335bdc93 /drivers/s390 | |
| parent | s390/qeth: rely on kernel for feature recovery (diff) | |
| download | linux-dbb27af91d2afd820c7cb5fab9b7608225e22fea.tar.xz linux-dbb27af91d2afd820c7cb5fab9b7608225e22fea.zip | |
s390/drivers: use setup_timer
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/fsm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index e5dea67f902e..8c14c6c3ad3d 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c @@ -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; |