usb: dwc3: Do core validation early on probe
authorThinh Nguyen <Thinh.Nguyen@synopsys.com>
Thu, 25 Apr 2019 21:19:21 +0000 (14:19 -0700)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Fri, 3 May 2019 06:13:49 +0000 (09:13 +0300)
The setting of the dr_mode may need to check the controller's revision.
The revision is set in the dwc3_core_is_valid(), which comes after
dr_mode setting. Let's move it closer to the start of the dwc3_probe()
function and before calling dwc3_get_dr_mode().

Signed-off-by: Thinh Nguyen <thinhn@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc3/core.c

index 2c9110e..2e06607 100644 (file)
@@ -896,12 +896,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
        u32                     reg;
        int                     ret;
 
-       if (!dwc3_core_is_valid(dwc)) {
-               dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
-               ret = -ENODEV;
-               goto err0;
-       }
-
        /*
         * Write Linux Version Code to our GUID register so it's easy to figure
         * out which kernel version a bug was found.
@@ -1429,6 +1423,11 @@ static int dwc3_probe(struct platform_device *pdev)
        dwc->regs       = regs;
        dwc->regs_size  = resource_size(&dwc_res);
 
+       if (!dwc3_core_is_valid(dwc)) {
+               dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
+               return -ENODEV;
+       }
+
        dwc3_get_properties(dwc);
 
        dwc->reset = devm_reset_control_get_optional_shared(dev, NULL);