Use setup_timer function instead of initializing timer with the
   function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        r8a66597->gadget.max_speed = USB_SPEED_HIGH;
        r8a66597->gadget.name = udc_name;
 
-       init_timer(&r8a66597->timer);
-       r8a66597->timer.function = r8a66597_timer;
-       r8a66597->timer.data = (unsigned long)r8a66597;
+       setup_timer(&r8a66597->timer, r8a66597_timer, (unsigned long)r8a66597);
        r8a66597->reg = reg;
 
        if (r8a66597->pdata->on_chip) {