Use timer API function setup_timer instead of init_timer to
initialize a kernel timer.

Signed-off-by: Muhammad Falak R Wani <[email protected]>
---
 drivers/uwb/drp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 8fc1b78..38d0504 100644
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -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);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to