Re: [PATCH 3/3] i2c/ibm-iic: drop NO_IRQ
From: Grant Likely <hidden>
Date: 2010-02-16 16:01:48
Also in:
linux-i2c
On Thu, Oct 22, 2009 at 2:11 PM, Wolfram Sang [off-list ref] 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 <redacted> Cc: Sean MacLennan <redacted> Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Grant Likely <redacted> Ben, will you pick up this series of 3, or would you like me to merge them through the powerpc tree? Thanks, g.
quoted hunk ↗ jump to hunk
--- =A0drivers/i2c/busses/i2c-ibm_iic.c | =A0 14 +++++++------- =A01 files changed, 7 insertions(+), 7 deletions(-)diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ib=
m_iic.c
quoted hunk ↗ jump to hunk
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_devi=
ce *ofdev,
=A0 =A0 =A0 =A0int irq;
=A0 =A0 =A0 =A0if (iic_force_poll)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return NO_IRQ;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return 0;
=A0 =A0 =A0 =A0irq =3D irq_of_parse_and_map(np, 0);
- =A0 =A0 =A0 if (irq =3D=3D NO_IRQ) {
+ =A0 =A0 =A0 if (!irq) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_err(&ofdev->dev, "irq_of_parse_and_map=failed\n");
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return NO_IRQ; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return 0; =A0 =A0 =A0 =A0} =A0 =A0 =A0 =A0/* Disable interrupts until we finish initialization, assu=
mes
quoted hunk ↗ jump to hunk
@@ -683,7 +683,7 @@ static int __devinit iic_request_irq(struct of_device=
*ofdev,
=A0 =A0 =A0 =A0if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_err(&ofdev->dev, "request_irq %d faile=d\n", irq);
quoted hunk ↗ jump to hunk
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Fallback to the polling mode */ - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return NO_IRQ; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return 0; =A0 =A0 =A0 =A0} =A0 =A0 =A0 =A0return irq;@@ -719,7 +719,7 @@ static int __devinit iic_probe(struct of_device *ofde=
v,
=A0 =A0 =A0 =A0init_waitqueue_head(&dev->wq); =A0 =A0 =A0 =A0dev->irq =3D iic_request_irq(ofdev, dev); - =A0 =A0 =A0 if (dev->irq =3D=3D NO_IRQ) + =A0 =A0 =A0 if (!dev->irq) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_warn(&ofdev->dev, "using polling mode\=
n");
quoted hunk ↗ jump to hunk
=A0 =A0 =A0 =A0/* Board specific settings */@@ -766,7 +766,7 @@ static int __devinit iic_probe(struct of_device *ofde=
v,
quoted hunk ↗ jump to hunk
=A0 =A0 =A0 =A0return 0; =A0error_cleanup: - =A0 =A0 =A0 if (dev->irq !=3D NO_IRQ) { + =A0 =A0 =A0 if (dev->irq) { =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iic_interrupt_mode(dev, 0); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free_irq(dev->irq, dev); =A0 =A0 =A0 =A0}@@ -790,7 +790,7 @@ static int __devexit iic_remove(struct of_device *ofd=
ev)
=A0 =A0 =A0 =A0i2c_del_adapter(&dev->adap);
- =A0 =A0 =A0 if (dev->irq !=3D NO_IRQ) {
+ =A0 =A0 =A0 if (dev->irq) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0iic_interrupt_mode(dev, 0);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free_irq(dev->irq, dev);
=A0 =A0 =A0 =A0}
--
1.6.5
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev--=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.