summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-08-22 22:41:43 +0300
committerKees Cook <keescook@chromium.org>2017-11-22 02:46:44 +0300
commit1e9aa74ecd84ac3eeffb7a9f08f9021d7df6486a (patch)
treec1c1d3526722f494e84ef9d75b27b834c8f84241
parent2ea5b4def995994a3c5b8fe075b42c1619873ad6 (diff)
downloadlinux-1e9aa74ecd84ac3eeffb7a9f08f9021d7df6486a.tar.xz
net/atm/mpc: Avoid open-coded assignment of timer callback function
Instead of a single function assignment, just fold this into DEFINE_TIMER(). Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r--net/atm/mpc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index e882d8b5db05..7c6a1cc760a2 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -121,7 +121,7 @@ static struct notifier_block mpoa_notifier = {
struct mpoa_client *mpcs = NULL; /* FIXME */
static struct atm_mpoa_qos *qos_head = NULL;
-static DEFINE_TIMER(mpc_timer, NULL);
+static DEFINE_TIMER(mpc_timer, mpc_cache_check);
static struct mpoa_client *find_mpc_by_itfnum(int itf)
@@ -1413,7 +1413,6 @@ static void mpc_timer_refresh(void)
{
mpc_timer.expires = jiffies + (MPC_P2 * HZ);
checking_time = mpc_timer.expires;
- mpc_timer.function = (TIMER_FUNC_TYPE)mpc_cache_check;
add_timer(&mpc_timer);
}