i2c-mpc: Compare to NO_IRQ instead of zero

Alter the mpc i2c driver to use the NO_IRQ symbol instead of the constant
zero when checking for valid interrupts. NO_IRQ=-1 on ppc and NO_IRQ=0 on
powerpc so the checks against zero are not correct.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Jon Smirl 2008-05-11 20:37:04 +02:00 коммит произвёл Jean Delvare
Родитель 9662369786
Коммит f5fff3602a
1 изменённых файлов: 7 добавлений и 9 удалений

Просмотреть файл

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