Commit 2049b5bc authored by Felipe Balbi's avatar Felipe Balbi Committed by Wolfram Sang

i2c: omap: decrease indentation level on data handling

The patch intends to decrease the indentation level on the
data handling
by using the fact that else of if (dev->buf_len) is same as
if (!dev->buf_len)

if (dev->buf_len) {
	aaa;
} else {
	bbb;
	break;
}

to

if (!dev->buf_len) {
        bbb;
        break;
}
aaa;

Hence no functional changes.
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by : Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent baf3d7b7
...@@ -813,22 +813,7 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -813,22 +813,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
>> 8) & 0x3F; >> 8) & 0x3F;
} }
while (num_bytes--) { while (num_bytes--) {
w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG); if (!dev->buf_len) {
if (dev->buf_len) {
*dev->buf++ = w;
dev->buf_len--;
/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
*dev->buf++ = w >> 8;
dev->buf_len--;
}
}
} else {
if (stat & OMAP_I2C_STAT_RRDY) if (stat & OMAP_I2C_STAT_RRDY)
dev_err(dev->dev, dev_err(dev->dev,
"RRDY IRQ while no data" "RRDY IRQ while no data"
...@@ -839,6 +824,21 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -839,6 +824,21 @@ omap_i2c_isr(int this_irq, void *dev_id)
" requested\n"); " requested\n");
break; break;
} }
w = omap_i2c_read_reg(dev, OMAP_I2C_DATA_REG);
*dev->buf++ = w;
dev->buf_len--;
/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
*dev->buf++ = w >> 8;
dev->buf_len--;
}
}
} }
omap_i2c_ack_stat(dev, omap_i2c_ack_stat(dev,
stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)); stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR));
...@@ -855,22 +855,7 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -855,22 +855,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
& 0x3F; & 0x3F;
} }
while (num_bytes--) { while (num_bytes--) {
w = 0; if (!dev->buf_len) {
if (dev->buf_len) {
w = *dev->buf++;
dev->buf_len--;
/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
w |= *dev->buf++ << 8;
dev->buf_len--;
}
}
} else {
if (stat & OMAP_I2C_STAT_XRDY) if (stat & OMAP_I2C_STAT_XRDY)
dev_err(dev->dev, dev_err(dev->dev,
"XRDY IRQ while no " "XRDY IRQ while no "
...@@ -882,6 +867,20 @@ omap_i2c_isr(int this_irq, void *dev_id) ...@@ -882,6 +867,20 @@ omap_i2c_isr(int this_irq, void *dev_id)
break; break;
} }
w = *dev->buf++;
dev->buf_len--;
/*
* Data reg in 2430, omap3 and
* omap4 is 8 bit wide
*/
if (dev->flags &
OMAP_I2C_FLAG_16BIT_DATA_REG) {
if (dev->buf_len) {
w |= *dev->buf++ << 8;
dev->buf_len--;
}
}
if ((dev->errata & I2C_OMAP_ERRATA_I462) && if ((dev->errata & I2C_OMAP_ERRATA_I462) &&
errata_omap3_i462(dev, &stat, &err)) errata_omap3_i462(dev, &stat, &err))
goto complete; goto complete;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment