diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2014-03-27 16:15:55 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-04-21 14:07:26 -0500 |
| commit | 196800da39a142e2952ad5e1cb58a84838956764 (patch) | |
| tree | 591b809d7eb5d30b6af2d580c4e1a272cdafec1c /drivers/usb/gadget/gr_udc.c | |
| parent | d9a6ef1bb27e589ec40f792f3e742c3f54cbdb28 (diff) | |
| download | blackbird-op-linux-196800da39a142e2952ad5e1cb58a84838956764.tar.gz blackbird-op-linux-196800da39a142e2952ad5e1cb58a84838956764.zip | |
usb: gadget: gr_udc: Use platform_get_irq instead of irq_of_parse_and_map
Use platform_get_irq as no mapping needs to be done. No functional difference
for SPARC which is the typical environment for the driver though. Suggested by
Mark Rutland.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/gr_udc.c')
| -rw-r--r-- | drivers/usb/gadget/gr_udc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/gadget/gr_udc.c b/drivers/usb/gadget/gr_udc.c index ae5bebe98b2d..7a992546335d 100644 --- a/drivers/usb/gadget/gr_udc.c +++ b/drivers/usb/gadget/gr_udc.c @@ -2108,20 +2108,22 @@ static int gr_probe(struct platform_device *pdev) if (IS_ERR(regs)) return PTR_ERR(regs); - dev->irq = irq_of_parse_and_map(dev->dev->of_node, 0); - if (!dev->irq) { + dev->irq = platform_get_irq(pdev, 0); + if (dev->irq <= 0) { dev_err(dev->dev, "No irq found\n"); return -ENODEV; } /* Some core configurations has separate irqs for IN and OUT events */ - dev->irqi = irq_of_parse_and_map(dev->dev->of_node, 1); - if (dev->irqi) { - dev->irqo = irq_of_parse_and_map(dev->dev->of_node, 2); - if (!dev->irqo) { + dev->irqi = platform_get_irq(pdev, 1); + if (dev->irqi > 0) { + dev->irqo = platform_get_irq(pdev, 2); + if (dev->irqo <= 0) { dev_err(dev->dev, "Found irqi but not irqo\n"); return -ENODEV; } + } else { + dev->irqi = 0; } dev->gadget.name = driver_name; |
