diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-03-23 14:15:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 20:33:42 +0100 |
| commit | aff55a3638a2d13de5cf0b0c45993378282cbe91 (patch) | |
| tree | f410bca6f54d51817634f5a8fa92304ac69a1b4e /drivers/isdn/hisax/w6692.c | |
| parent | Merge branch 'bridge-ext-learned-entries' (diff) | |
| download | linux-aff55a3638a2d13de5cf0b0c45993378282cbe91.tar.xz linux-aff55a3638a2d13de5cf0b0c45993378282cbe91.zip | |
isdn: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hisax/w6692.c')
| -rw-r--r-- | drivers/isdn/hisax/w6692.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index a85895585d90..c99f0ec58a01 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -901,9 +901,8 @@ static void initW6692(struct IsdnCardState *cs, int part) if (part & 1) { cs->setstack_d = setstack_W6692; cs->DC_Close = DC_Close_W6692; - cs->dbusytimer.function = (void *) dbusy_timer_handler; - cs->dbusytimer.data = (long) cs; - init_timer(&cs->dbusytimer); + setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler, + (long)cs); resetW6692(cs); ph_command(cs, W_L1CMD_RST); cs->dc.w6692.ph_state = W_L1CMD_RST; |