diff options
| author | Geliang Tang | 2017-03-23 14:15:57 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-03-24 20:33:42 +0100 |
| commit | aff55a3638a2d13de5cf0b0c45993378282cbe91 (patch) | |
| tree | f410bca6f54d51817634f5a8fa92304ac69a1b4e /drivers/isdn/hisax/diva.c | |
| parent | Merge branch 'bridge-ext-learned-entries' (diff) | |
| download | kernel-qcow2-linux-aff55a3638a2d13de5cf0b0c45993378282cbe91.tar.gz kernel-qcow2-linux-aff55a3638a2d13de5cf0b0c45993378282cbe91.tar.xz kernel-qcow2-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/diva.c')
| -rw-r--r-- | drivers/isdn/hisax/diva.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 4fc90de68d18..079336e593f9 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -976,9 +976,8 @@ static int setup_diva_common(struct IsdnCardState *cs) printk(KERN_INFO "Diva: IPACX Design Id: %x\n", MemReadISAC_IPACX(cs, IPACX_ID) & 0x3F); } else { /* DIVA 2.0 */ - cs->hw.diva.tl.function = (void *) diva_led_handler; - cs->hw.diva.tl.data = (long) cs; - init_timer(&cs->hw.diva.tl); + setup_timer(&cs->hw.diva.tl, (void *)diva_led_handler, + (long)cs); cs->readisac = &ReadISAC; cs->writeisac = &WriteISAC; cs->readisacfifo = &ReadISACfifo; |