From: Russell King Date: Thu, 3 May 2012 10:33:15 +0000 (+0100) Subject: AMBA: get rid of last two uses of NO_IRQ X-Git-Tag: Ubuntu-5.0.0-8.9~16086^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dfb85185bda373a70409c70c2632b02fb0f8f449;p=mirror_ubuntu-disco-kernel.git 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 --- 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) if (ret) goto err_release; - if (dev->irq[0] && dev->irq[0] != NO_IRQ) + if (dev->irq[0]) ret = device_create_file(&dev->dev, &dev_attr_irq0); - if (ret == 0 && dev->irq[1] && dev->irq[1] != NO_IRQ) + if (ret == 0 && dev->irq[1]) ret = device_create_file(&dev->dev, &dev_attr_irq1); if (ret == 0) 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, if (ret) goto unmap; - if (dev->irq[1] == NO_IRQ || !dev->irq[1]) + if (!dev->irq[1]) host->singleirq = true; else { ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,