summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/dsp_core.c
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-03-23 21:15:57 +0800
committerDavid S. Miller <davem@davemloft.net>2017-03-24 12:33:42 -0700
commitaff55a3638a2d13de5cf0b0c45993378282cbe91 (patch)
treef410bca6f54d51817634f5a8fa92304ac69a1b4e /drivers/isdn/mISDN/dsp_core.c
parent9096643856919eba4ea7dd462e3528bc6d230f4f (diff)
downloadlinux-stable-aff55a3638a2d13de5cf0b0c45993378282cbe91.tar.gz
linux-stable-aff55a3638a2d13de5cf0b0c45993378282cbe91.tar.bz2
linux-stable-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/mISDN/dsp_core.c')
-rw-r--r--drivers/isdn/mISDN/dsp_core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 9b85295aa657..880e9d367a39 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -1092,9 +1092,7 @@ dspcreate(struct channel_req *crq)
ndsp->pcm_bank_tx = -1;
ndsp->hfc_conf = -1; /* current conference number */
/* set tone timer */
- ndsp->tone.tl.function = (void *)dsp_tone_timeout;
- ndsp->tone.tl.data = (long) ndsp;
- init_timer(&ndsp->tone.tl);
+ setup_timer(&ndsp->tone.tl, (void *)dsp_tone_timeout, (long)ndsp);
if (dtmfthreshold < 20 || dtmfthreshold > 500)
dtmfthreshold = 200;