usb: dwc2: gadget: move setting last reset time to s3c_hsotg_core_init
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 20 Oct 2014 10:45:35 +0000 (12:45 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 3 Nov 2014 16:01:22 +0000 (10:01 -0600)
This patch removes duplicated code and sets last_rst variable in the
function which does the hardware reset.

Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc2/gadget.c

index 701d3e142bbf3617d8ed07895b40a96d91cefea6..f1cde255570a3929a13bde5ed54d53cbc110e75f 100644 (file)
@@ -2247,6 +2247,8 @@ static void s3c_hsotg_core_init(struct s3c_hsotg *hsotg)
        /* must be at-least 3ms to allow bus to see disconnect */
        mdelay(3);
 
+       hsotg->last_rst = jiffies;
+
        /* remove the soft-disconnect and let's go */
        __bic32(hsotg->regs + DCTL, DCTL_SFTDISCON);
 }
@@ -2341,7 +2343,6 @@ irq_retry:
                                                          -ECONNRESET, true);
 
                                s3c_hsotg_core_init(hsotg);
-                               hsotg->last_rst = jiffies;
                        }
                }
        }
@@ -2905,7 +2906,6 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
                goto err;
        }
 
-       hsotg->last_rst = jiffies;
        dev_info(hsotg->dev, "bound driver %s\n", driver->driver.name);
        return 0;
 
@@ -3656,7 +3656,6 @@ static int s3c_hsotg_resume(struct platform_device *pdev)
        }
 
        spin_lock_irqsave(&hsotg->lock, flags);
-       hsotg->last_rst = jiffies;
        s3c_hsotg_phy_enable(hsotg);
        s3c_hsotg_core_init(hsotg);
        spin_unlock_irqrestore(&hsotg->lock, flags);