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/hfc_usb.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/hfc_usb.c')
| -rw-r--r-- | drivers/isdn/hisax/hfc_usb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 678bd5224bc3..6dbd1f1da14f 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c @@ -1165,14 +1165,10 @@ hfc_usb_init(hfcusb_data *hfc) hfc->old_led_state = 0; /* init the t3 timer */ - init_timer(&hfc->t3_timer); - hfc->t3_timer.data = (long) hfc; - hfc->t3_timer.function = (void *) l1_timer_expire_t3; + setup_timer(&hfc->t3_timer, (void *)l1_timer_expire_t3, (long)hfc); /* init the t4 timer */ - init_timer(&hfc->t4_timer); - hfc->t4_timer.data = (long) hfc; - hfc->t4_timer.function = (void *) l1_timer_expire_t4; + setup_timer(&hfc->t4_timer, (void *)l1_timer_expire_t4, (long)hfc); /* init the background machinery for control requests */ hfc->ctrl_read.bRequestType = 0xc0; |