diff options
author | Geliang Tang <geliangtang@gmail.com> | 2017-03-23 21:15:57 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-24 12:33:42 -0700 |
commit | aff55a3638a2d13de5cf0b0c45993378282cbe91 (patch) | |
tree | f410bca6f54d51817634f5a8fa92304ac69a1b4e /drivers/isdn/i4l/isdn_ppp.c | |
parent | 9096643856919eba4ea7dd462e3528bc6d230f4f (diff) | |
download | linux-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/i4l/isdn_ppp.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 9c1e8adaf4fc..d07dd5196ffc 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -2370,9 +2370,8 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s rs->state = CCPResetIdle; rs->is = is; rs->id = id; - init_timer(&rs->timer); - rs->timer.data = (unsigned long)rs; - rs->timer.function = isdn_ppp_ccp_timer_callback; + setup_timer(&rs->timer, isdn_ppp_ccp_timer_callback, + (unsigned long)rs); is->reset->rs[id] = rs; } return rs; |