On Thu, Oct 22, 2009 at 2:11 PM, Wolfram Sang <w.sang@xxxxxxxxxxxxxx> wrote: > 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@xxxxxxxxxxxxxx> > Cc: Sean MacLennan <smaclennan@xxxxxxxxxxxx> > Cc: Ben Dooks <ben-linux@xxxxxxxxx> Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx> Ben, will you pick up this series of 3, or would you like me to merge them through the powerpc tree? Thanks, g. > --- > drivers/i2c/busses/i2c-ibm_iic.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c > index b1bc6e2..2bef534 100644 > --- a/drivers/i2c/busses/i2c-ibm_iic.c > +++ b/drivers/i2c/busses/i2c-ibm_iic.c > @@ -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 > @@ -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; > @@ -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 */ > @@ -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); > } > @@ -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); > } > -- > 1.6.5 > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@xxxxxxxxxxxxxxxx > https://lists.ozlabs.org/listinfo/linuxppc-dev > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
