]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
uwb: drp: Use setup_timer
authorMuhammad Falak R Wani <falakreyaz@gmail.com>
Tue, 20 Oct 2015 18:28:17 +0000 (23:58 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 02:52:53 +0000 (19:52 -0700)
Use timer API function setup_timer instead of init_timer to
initialize a kernel timer.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uwb/drp.c

index 8fc1b787dceddd333b6c98cb99a4ea95fa81ec08..38d0504a1bbc50a29a3d639a772648ef385e5692 100644 (file)
@@ -642,9 +642,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
        }
 
        INIT_LIST_HEAD(&cnflt->rc_node);
-       init_timer(&cnflt->timer);
-       cnflt->timer.function = uwb_cnflt_timer;
-       cnflt->timer.data     = (unsigned long)cnflt;
+       setup_timer(&cnflt->timer, uwb_cnflt_timer, (unsigned long)cnflt);
 
        cnflt->rc = rc;
        INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work);