diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-03 06:33:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-03 06:33:15 -0400 |
commit | dfb85185bda373a70409c70c2632b02fb0f8f449 (patch) | |
tree | 4ff752396203345229bce1b738fa07795daa2122 | |
parent | 08956a0e8a697edb566766536b2fbbb168ac6ecc (diff) |
AMBA: get rid of last two uses of NO_IRQ
This gets rid of the last two users of NO_IRQ in AMBA primecell
drivers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/amba/bus.c | 4 | ||||
-rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 9469d8722038..b7e728517284 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c | |||
@@ -527,9 +527,9 @@ int amba_device_add(struct amba_device *dev, struct resource *parent) | |||
527 | if (ret) | 527 | if (ret) |
528 | goto err_release; | 528 | goto err_release; |
529 | 529 | ||
530 | if (dev->irq[0] && dev->irq[0] != NO_IRQ) | 530 | if (dev->irq[0]) |
531 | ret = device_create_file(&dev->dev, &dev_attr_irq0); | 531 | ret = device_create_file(&dev->dev, &dev_attr_irq0); |
532 | if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ) | 532 | if (ret == 0 && dev->irq[1]) |
533 | ret = device_create_file(&dev->dev, &dev_attr_irq1); | 533 | ret = device_create_file(&dev->dev, &dev_attr_irq1); |
534 | if (ret == 0) | 534 | if (ret == 0) |
535 | return ret; | 535 | return ret; |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 032b84791a16..289f30ae22e2 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -1397,7 +1397,7 @@ static int __devinit mmci_probe(struct amba_device *dev, | |||
1397 | if (ret) | 1397 | if (ret) |
1398 | goto unmap; | 1398 | goto unmap; |
1399 | 1399 | ||
1400 | if (dev->irq[1] == NO_IRQ || !dev->irq[1]) | 1400 | if (!dev->irq[1]) |
1401 | host->singleirq = true; | 1401 | host->singleirq = true; |
1402 | else { | 1402 | else { |
1403 | ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED, | 1403 | ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED, |