Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i2c: omap: switch over to do {} while loop

Browse source 
this will make sure that we execute at least once.
No functional changes otherwise.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Felipe Balbi 2012-09-12 16:28:03 +05:30 committed by Wolfram Sang
parent 3312d25e1a
commit 66b9298878
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/i2c/busses/i2c-omap.c
View file

@ -827,20 +827,28 @@ omap_i2c_isr(int this_irq, void *dev_id)
struct omap_i2c_dev *dev = dev_id; struct omap_i2c_dev *dev = dev_id;
u16 bits; u16 bits;
u16 stat; u16 stat;
int err, count = 0; int err = 0, count = 0;
if (pm_runtime_suspended(dev->dev)) if (pm_runtime_suspended(dev->dev))
return IRQ_NONE; return IRQ_NONE;
do {
bits = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG); bits = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
while ((stat = (omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG))) & bits) { stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
stat &= bits;
if (!stat) {
/* my work here is done */
return IRQ_HANDLED;
}
dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat); dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);
if (count++ == 100) { if (count++ == 100) {
dev_warn(dev->dev, "Too much work in one IRQ\n"); dev_warn(dev->dev, "Too much work in one IRQ\n");
break; omap_i2c_complete_cmd(dev, err);
return IRQ_HANDLED;
} }
err = 0;
complete: complete:
/* /*
* Ack the stat in one go, but [R/X]DR and [R/X]RDY should be * Ack the stat in one go, but [R/X]DR and [R/X]RDY should be
@ -940,7 +948,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
dev_err(dev->dev, "Transmit underflow\n"); dev_err(dev->dev, "Transmit underflow\n");
dev->cmd_err |= OMAP_I2C_STAT_XUDF; dev->cmd_err |= OMAP_I2C_STAT_XUDF;
} }
} } while (stat);
return count ? IRQ_HANDLED : IRQ_NONE; return count ? IRQ_HANDLED : IRQ_NONE;
} }