Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ec9e20 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ben Dooks
Browse files

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: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarSean MacLennan <smaclennan@pikatech.com>
Cc: Ben Dooks <ben-linux@fluff.org>
parent b865a4e7

drivers/i2c/busses/i2c-ibm_iic.c

+7 −7
Original line number Diff line number Diff line
@@ -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);

	}