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/hardware/mISDN/mISDNisar.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/hardware/mISDN/mISDNisar.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNisar.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index feafa91c2ed9..5b078591b6ee 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c @@ -1635,13 +1635,11 @@ init_isar(struct isar_hw *isar) } if (isar->version != 1) return -EINVAL; - isar->ch[0].ftimer.function = &ftimer_handler; - isar->ch[0].ftimer.data = (long)&isar->ch[0]; - init_timer(&isar->ch[0].ftimer); + setup_timer(&isar->ch[0].ftimer, &ftimer_handler, + (long)&isar->ch[0]); test_and_set_bit(FLG_INITIALIZED, &isar->ch[0].bch.Flags); - isar->ch[1].ftimer.function = &ftimer_handler; - isar->ch[1].ftimer.data = (long)&isar->ch[1]; - init_timer(&isar->ch[1].ftimer); + setup_timer(&isar->ch[1].ftimer, &ftimer_handler, + (long)&isar->ch[1]); test_and_set_bit(FLG_INITIALIZED, &isar->ch[1].bch.Flags); return 0; } |