[PATCH 52/82] usb: dwc3: host: extract dwc3_host_get_irq()

[Felipe Balbi]

Cleanup only, no functional changes.

Signed-off-by: Felipe Balbi <felipe.ba...@linux.intel.com>
---
 drivers/usb/dwc3/host.c | 68 +++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index f6533c68fed1..ed824647ead8 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -19,48 +19,50 @@
 
 #include "core.h"
 
+static int dwc3_host_get_irq(struct dwc3 *dwc)
+{
+       struct platform_device  *dwc3_pdev = to_platform_device(dwc->dev);
+       int irq;
+
+       irq = platform_get_irq_byname(dwc3_pdev, "host");
+       if (irq > 0)
+               goto out;
+
+       if (irq == -EPROBE_DEFER)
+               goto out;
+
+       irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+       if (irq > 0)
+               goto out;
+
+       if (irq == -EPROBE_DEFER)
+               goto out;
+
+       irq = platform_get_irq(dwc3_pdev, 0);
+       if (irq > 0)
+               goto out;
+
+       if (irq != -EPROBE_DEFER)
+               dev_err(dwc->dev, "missing host IRQ\n");
+
+       if (!irq)
+               irq = -EINVAL;
+
+out:
+       return irq;
+}
+
 int dwc3_host_init(struct dwc3 *dwc)
 {
        struct property_entry   props[2];
        struct platform_device  *xhci;
        int                     ret, irq;
        struct resource         *res;
-       struct platform_device  *dwc3_pdev = to_platform_device(dwc->dev);
 
-       irq = platform_get_irq_byname(dwc3_pdev, "host");
-       if (irq == -EPROBE_DEFER)
+       irq = dwc3_host_get_irq(dwc);
+       if (irq < 0)
                return irq;
 
-       if (irq <= 0) {
-               irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
-               if (irq == -EPROBE_DEFER)
-                       return irq;
-
-               if (irq <= 0) {
-                       irq = platform_get_irq(dwc3_pdev, 0);
-                       if (irq <= 0) {
-                               if (irq != -EPROBE_DEFER) {
-                                       dev_err(dwc->dev,
-                                               "missing host IRQ\n");
-                               }
-                               if (!irq)
-                                       irq = -EINVAL;
-                               return irq;
-                       } else {
-                               res = platform_get_resource(dwc3_pdev,
-                                                           IORESOURCE_IRQ, 0);
-                       }
-               } else {
-                       res = platform_get_resource_byname(dwc3_pdev,
-                                                          IORESOURCE_IRQ,
-                                                          "dwc_usb3");
-               }
-
-       } else {
-               res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ,
-                                                  "host");
-       }
-
        dwc->xhci_resources[1].start = irq;
        dwc->xhci_resources[1].end = irq;
        dwc->xhci_resources[1].flags = res->flags;
-- 
2.10.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html