Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

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

diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c
index 8cb71bb333c2ea830881ddc8bf19afd4096b3d60..36b5cb62c15dba7b734ffa61460fdeb3a31e79cc 100644 (file)
--- a/drivers/uwb/neh.c
+++ b/drivers/uwb/neh.c
@@ -223,9 +223,7 @@ struct uwb_rc_neh *uwb_rc_neh_add(struct uwb_rc *rc, struct uwb_rccb *cmd,
 
        kref_init(&neh->kref);
        INIT_LIST_HEAD(&neh->list_node);
-       init_timer(&neh->timer);
-       neh->timer.function = uwb_rc_neh_timer;
-       neh->timer.data     = (unsigned long)neh;
+       setup_timer(&neh->timer, uwb_rc_neh_timer, (unsigned long)neh);
 
        neh->rc = rc;
        neh->evt_type = expected_type;