Skip to content

Commit

Permalink
i2c-ibm-iic: drop NO_IRQ
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Grant Likely <[email protected]>
Acked-by: Sean MacLennan <[email protected]>
Cc: Ben Dooks <[email protected]>
  • Loading branch information
Wolfram Sang authored and Ben Dooks committed May 19, 2010
1 parent b865a4e commit f0ec9e2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/i2c/busses/i2c-ibm_iic.c
Original file line number Diff line number Diff line change
Expand Up @@ -668,12 +668,12 @@ static int __devinit iic_request_irq(struct of_device *ofdev,
int irq;

if (iic_force_poll)
return NO_IRQ;
return 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");
return NO_IRQ;
return 0;
}

/* Disable interrupts until we finish initialization, assumes
Expand All @@ -683,7 +683,7 @@ static int __devinit iic_request_irq(struct of_device *ofdev,
if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) {
dev_err(&ofdev->dev, "request_irq %d failed\n", irq);
/* Fallback to the polling mode */
return NO_IRQ;
return 0;
}

return irq;
Expand Down Expand Up @@ -719,7 +719,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
init_waitqueue_head(&dev->wq);

dev->irq = iic_request_irq(ofdev, dev);
if (dev->irq == NO_IRQ)
if (!dev->irq)
dev_warn(&ofdev->dev, "using polling mode\n");

/* Board specific settings */
Expand Down Expand Up @@ -766,7 +766,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
return 0;

error_cleanup:
if (dev->irq != NO_IRQ) {
if (dev->irq) {
iic_interrupt_mode(dev, 0);
free_irq(dev->irq, dev);
}
Expand All @@ -790,7 +790,7 @@ static int __devexit iic_remove(struct of_device *ofdev)

i2c_del_adapter(&dev->adap);

if (dev->irq != NO_IRQ) {
if (dev->irq) {
iic_interrupt_mode(dev, 0);
free_irq(dev->irq, dev);
}
Expand Down

0 comments on commit f0ec9e2

Please sign in to comment.