Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Convert some more new-style drivers to use module aliasing
  i2c: Match dummy devices by type
  i2c-sibyte: Mark i2c_sibyte_add_bus() as static
  i2c-sibyte: Correct a comment about frequency
  i2c: Improve the functionality documentation
  i2c: Improve smbus-protocol documentation
  i2c-piix4: Blacklist two mainboards
  i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
  i2c-mpc: Compare to NO_IRQ instead of zero

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 18beb0ad7bf3..a076129de7e8 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -99,7 +99,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
         u32 x;
         int result = 0;
 
-        if (i2c->irq == 0)
+        if (i2c->irq == NO_IRQ)
         {
                 while (!(readb(i2c->base + MPC_I2C_SR) & CSR_MIF)) {
                         schedule();
@@ -329,10 +329,9 @@ static int fsl_i2c_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         i2c->irq = platform_get_irq(pdev, 0);
-        if (i2c->irq < 0) {
-                result = -ENXIO;
-                goto fail_get_irq;
-        }
+        if (i2c->irq < 0)
+                i2c->irq = NO_IRQ; /* Use polling */
+
         i2c->flags = pdata->device_flags;
         init_waitqueue_head(&i2c->queue);
 
@@ -344,7 +343,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
                 goto fail_map;
         }
 
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 if ((result = request_irq(i2c->irq, mpc_i2c_isr,
                                           IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
                         printk(KERN_ERR
@@ -367,12 +366,11 @@ static int fsl_i2c_probe(struct platform_device *pdev)
         return result;
 
       fail_add:
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 free_irq(i2c->irq, i2c);
       fail_irq:
         iounmap(i2c->base);
       fail_map:
-      fail_get_irq:
         kfree(i2c);
         return result;
 };
@@ -384,7 +382,7 @@ static int fsl_i2c_remove(struct platform_device *pdev)
         i2c_del_adapter(&i2c->adap);
         platform_set_drvdata(pdev, NULL);
 
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 free_irq(i2c->irq, i2c);
 
         iounmap(i2c->base);