Loading drivers/usb/dwc3/gadget.c +39 −23 Original line number Original line Diff line number Diff line Loading @@ -2871,38 +2871,54 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt) return dwc3_check_event_buf(evt); return dwc3_check_event_buf(evt); } } /** static int dwc3_gadget_get_irq(struct dwc3 *dwc) * dwc3_gadget_init - Initializes gadget related registers * @dwc: pointer to our controller context structure * * Returns 0 on success otherwise negative errno. */ int dwc3_gadget_init(struct dwc3 *dwc) { { int ret, irq; struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); int irq; irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); if (irq > 0) goto out; if (irq == -EPROBE_DEFER) if (irq == -EPROBE_DEFER) return irq; goto out; if (irq <= 0) { irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3"); irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3"); if (irq > 0) goto out; if (irq == -EPROBE_DEFER) if (irq == -EPROBE_DEFER) return irq; goto out; if (irq <= 0) { irq = platform_get_irq(dwc3_pdev, 0); irq = platform_get_irq(dwc3_pdev, 0); if (irq <= 0) { if (irq > 0) if (irq != -EPROBE_DEFER) { goto out; dev_err(dwc->dev, "missing peripheral IRQ\n"); if (irq != -EPROBE_DEFER) } dev_err(dwc->dev, "missing peripheral IRQ\n"); if (!irq) if (!irq) irq = -EINVAL; irq = -EINVAL; out: return irq; return irq; } } } /** * dwc3_gadget_init - Initializes gadget related registers * @dwc: pointer to our controller context structure * * Returns 0 on success otherwise negative errno. */ int dwc3_gadget_init(struct dwc3 *dwc) { int ret; int irq; irq = dwc3_gadget_get_irq(dwc); if (irq < 0) { ret = irq; goto err0; } } dwc->irq_gadget = irq; dwc->irq_gadget = irq; Loading Loading
drivers/usb/dwc3/gadget.c +39 −23 Original line number Original line Diff line number Diff line Loading @@ -2871,38 +2871,54 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt) return dwc3_check_event_buf(evt); return dwc3_check_event_buf(evt); } } /** static int dwc3_gadget_get_irq(struct dwc3 *dwc) * dwc3_gadget_init - Initializes gadget related registers * @dwc: pointer to our controller context structure * * Returns 0 on success otherwise negative errno. */ int dwc3_gadget_init(struct dwc3 *dwc) { { int ret, irq; struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); int irq; irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); if (irq > 0) goto out; if (irq == -EPROBE_DEFER) if (irq == -EPROBE_DEFER) return irq; goto out; if (irq <= 0) { irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3"); irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3"); if (irq > 0) goto out; if (irq == -EPROBE_DEFER) if (irq == -EPROBE_DEFER) return irq; goto out; if (irq <= 0) { irq = platform_get_irq(dwc3_pdev, 0); irq = platform_get_irq(dwc3_pdev, 0); if (irq <= 0) { if (irq > 0) if (irq != -EPROBE_DEFER) { goto out; dev_err(dwc->dev, "missing peripheral IRQ\n"); if (irq != -EPROBE_DEFER) } dev_err(dwc->dev, "missing peripheral IRQ\n"); if (!irq) if (!irq) irq = -EINVAL; irq = -EINVAL; out: return irq; return irq; } } } /** * dwc3_gadget_init - Initializes gadget related registers * @dwc: pointer to our controller context structure * * Returns 0 on success otherwise negative errno. */ int dwc3_gadget_init(struct dwc3 *dwc) { int ret; int irq; irq = dwc3_gadget_get_irq(dwc); if (irq < 0) { ret = irq; goto err0; } } dwc->irq_gadget = irq; dwc->irq_gadget = irq; Loading