p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb: dwc3: gadget: extract dwc3_gadget_get_irq() 

Cleanup only, no functional changes.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Felipe Balbi 2016-10-03 11:27:01 +03:00
parent 4dd5a69e49
commit 6db3812e09
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/usb/dwc3/gadget.c
View File

@ -2871,6 +2871,39 @@ 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)
{
struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
int irq;
irq = platform_get_irq_byname(dwc3_pdev, "peripheral");
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 peripheral IRQ\n");
if (!irq)
irq = -EINVAL;
out:
return irq;
}
/** /**
* dwc3_gadget_init - Initializes gadget related registers * dwc3_gadget_init - Initializes gadget related registers
* @dwc: pointer to our controller context structure * @dwc: pointer to our controller context structure
@ -2879,30 +2912,13 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt)
*/ */
int dwc3_gadget_init(struct dwc3 *dwc) int dwc3_gadget_init(struct dwc3 *dwc)
{ {
int ret, irq; int ret;
struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); int irq;
irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); irq = dwc3_gadget_get_irq(dwc);
if (irq == -EPROBE_DEFER) if (irq < 0) {
return irq; ret = irq;
goto err0;
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 peripheral IRQ\n");
}
if (!irq)
irq = -EINVAL;
return irq;
}
}
} }
dwc->irq_gadget = irq; dwc->irq_gadget = irq;