Skip to content

Commit

Permalink
usb: gadget: gr_udc: Use platform_get_irq instead of irq_of_parse_and…
Browse files Browse the repository at this point in the history
…_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 <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
  • Loading branch information
andreas-gaisler authored and Felipe Balbi committed Apr 21, 2014
1 parent d9a6ef1 commit 196800d
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/usb/gadget/gr_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 196800d

Please sign in to comment.