mmc-host: vub300: use setup_timer() helper.

Use setup_timer function instead of initializing timer with the
   function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index 8f569d257405f40b02e5d75eb6afd0662dfaf65c..c1a169843f99f3e41460b6491da8f6ab905a8bb9 100644 (file)
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -2323,13 +2323,11 @@ static int vub300_probe(struct usb_interface *interface,
        INIT_WORK(&vub300->cmndwork, vub300_cmndwork_thread);
        INIT_WORK(&vub300->deadwork, vub300_deadwork_thread);
        kref_init(&vub300->kref);
-       init_timer(&vub300->sg_transfer_timer);
-       vub300->sg_transfer_timer.data = (unsigned long)vub300;
-       vub300->sg_transfer_timer.function = vub300_sg_timed_out;
+       setup_timer(&vub300->sg_transfer_timer, vub300_sg_timed_out,
+                   (unsigned long)vub300);
        kref_get(&vub300->kref);
-       init_timer(&vub300->inactivity_timer);
-       vub300->inactivity_timer.data = (unsigned long)vub300;
-       vub300->inactivity_timer.function = vub300_inactivity_timer_expired;
+       setup_timer(&vub300->inactivity_timer,
+                   vub300_inactivity_timer_expired, (unsigned long)vub300);
        vub300->inactivity_timer.expires = jiffies + HZ;
        add_timer(&vub300->inactivity_timer);
        if (vub300->card_present)