openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c/ibm-iic: Drop NO_IRQ 

Drop NO_IRQ as 0 is the preferred way to describe 'no irq'
(http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is
only used on powerpc, where NO_IRQ is 0 anyhow.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Sean MacLennan <smaclennan@pikatech.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Wolfram Sang 2010-04-01 14:17:01 +00:00 committed by Benjamin Herrenschmidt
parent 6889f959b3
commit 13bb533996
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/i2c/busses/i2c-ibm_iic.c
View File

@ -668,12 +668,12 @@ static int __devinit iic_request_irq(struct of_device *ofdev,
int irq; int irq;
if (iic_force_poll) if (iic_force_poll)
return NO_IRQ; return 0;
irq = irq_of_parse_and_map(np, 0); irq = irq_of_parse_and_map(np, 0);
if (irq == NO_IRQ) { if (!irq) {
dev_err(&ofdev->dev, "irq_of_parse_and_map failed\n"); dev_err(&ofdev->dev, "irq_of_parse_and_map failed\n");
return NO_IRQ; return 0;
} }
/* Disable interrupts until we finish initialization, assumes /* Disable interrupts until we finish initialization, assumes
@ -683,7 +683,7 @@ static int __devinit iic_request_irq(struct of_device *ofdev,
if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) { if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) {
dev_err(&ofdev->dev, "request_irq %d failed\n", irq); dev_err(&ofdev->dev, "request_irq %d failed\n", irq);
/* Fallback to the polling mode */ /* Fallback to the polling mode */
return NO_IRQ; return 0;
} }
return irq; return irq;
@ -719,7 +719,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
init_waitqueue_head(&dev->wq); init_waitqueue_head(&dev->wq);
dev->irq = iic_request_irq(ofdev, dev); dev->irq = iic_request_irq(ofdev, dev);
if (dev->irq == NO_IRQ) if (!dev->irq)
dev_warn(&ofdev->dev, "using polling mode\n"); dev_warn(&ofdev->dev, "using polling mode\n");
/* Board specific settings */ /* Board specific settings */
@ -766,7 +766,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
return 0; return 0;
error_cleanup: error_cleanup:
if (dev->irq != NO_IRQ) { if (dev->irq) {
iic_interrupt_mode(dev, 0); iic_interrupt_mode(dev, 0);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
} }
@ -790,7 +790,7 @@ static int __devexit iic_remove(struct of_device *ofdev)
i2c_del_adapter(&dev->adap); i2c_del_adapter(&dev->adap);
if (dev->irq != NO_IRQ) { if (dev->irq) {
iic_interrupt_mode(dev, 0); iic_interrupt_mode(dev, 0);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
} }