1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index c4bcfaedeec9..bdc82fea0a1f 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2141,7 +2141,8 @@ static void r8a66597_hub_descriptor(struct r8a66597 *r8a66597,
         desc->bNbrPorts = r8a66597->max_root_hub;
         desc->bDescLength = 9;
         desc->bPwrOn2PwrGood = 0;
-        desc->wHubCharacteristics = cpu_to_le16(0x0011);
+        desc->wHubCharacteristics =
+                cpu_to_le16(HUB_CHAR_INDV_PORT_LPSM | HUB_CHAR_NO_OCPM);
         desc->u.hs.DeviceRemovable[0] =
                 ((1 << r8a66597->max_root_hub) - 1) << 1;
         desc->u.hs.DeviceRemovable[1] = ~0;
@@ -2483,9 +2484,8 @@ static int r8a66597_probe(struct platform_device *pdev)
                 r8a66597->max_root_hub = 2;
 
         spin_lock_init(&r8a66597->lock);
-        init_timer(&r8a66597->rh_timer);
-        r8a66597->rh_timer.function = r8a66597_timer;
-        r8a66597->rh_timer.data = (unsigned long)r8a66597;
+        setup_timer(&r8a66597->rh_timer, r8a66597_timer,
+                    (unsigned long)r8a66597);
         r8a66597->reg = reg;
 
         /* make sure no interrupts are pending */
@@ -2496,9 +2496,8 @@ static int r8a66597_probe(struct platform_device *pdev)
 
         for (i = 0; i < R8A66597_MAX_NUM_PIPE; i++) {
                 INIT_LIST_HEAD(&r8a66597->pipe_queue[i]);
-                init_timer(&r8a66597->td_timer[i]);
-                r8a66597->td_timer[i].function = r8a66597_td_timer;
-                r8a66597->td_timer[i].data = (unsigned long)r8a66597;
+                setup_timer(&r8a66597->td_timer[i], r8a66597_td_timer,
+                            (unsigned long)r8a66597);
                 setup_timer(&r8a66597->interval_timer[i],
                                 r8a66597_interval_timer,
                                 (unsigned long)r8a66597);