Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[firefly-linux-kernel-4.4.55.git] / drivers / uwb / drp.c

diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 8fc1b787dceddd333b6c98cb99a4ea95fa81ec08..38d0504a1bbc50a29a3d639a772648ef385e5692 100644 (file)
--- 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);