summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/teleint.c
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-03-23 14:15:57 +0100
committerDavid S. Miller <davem@davemloft.net>2017-03-24 20:33:42 +0100
commitaff55a3638a2d13de5cf0b0c45993378282cbe91 (patch)
treef410bca6f54d51817634f5a8fa92304ac69a1b4e /drivers/isdn/hisax/teleint.c
parentMerge branch 'bridge-ext-learned-entries' (diff)
downloadlinux-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/teleint.c')
-rw-r--r--drivers/isdn/hisax/teleint.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c
index bf647545c70c..950399f066ef 100644
--- a/drivers/isdn/hisax/teleint.c
+++ b/drivers/isdn/hisax/teleint.c
@@ -278,9 +278,7 @@ int setup_TeleInt(struct IsdnCard *card)
cs->bcs[0].hw.hfc.send = NULL;
cs->bcs[1].hw.hfc.send = NULL;
cs->hw.hfc.fifosize = 7 * 1024 + 512;
- cs->hw.hfc.timer.function = (void *) TeleInt_Timer;
- cs->hw.hfc.timer.data = (long) cs;
- init_timer(&cs->hw.hfc.timer);
+ setup_timer(&cs->hw.hfc.timer, (void *)TeleInt_Timer, (long)cs);
if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) {
printk(KERN_WARNING
"HiSax: TeleInt config port %x-%x already in use\n",