mirror of https://gitee.com/openkylin/linux.git
i2c: omap: simplify IRQ exit path
instead of having multiple return points, use a goto statement to make that clearer. 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:
parent
6a85ced2cf
commit
4a7ec4eda5
|
@ -853,24 +853,21 @@ omap_i2c_isr(int this_irq, void *dev_id)
|
||||||
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");
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
complete:
|
complete:
|
||||||
if (stat & OMAP_I2C_STAT_NACK) {
|
if (stat & OMAP_I2C_STAT_NACK) {
|
||||||
err |= OMAP_I2C_STAT_NACK;
|
err |= OMAP_I2C_STAT_NACK;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat & OMAP_I2C_STAT_AL) {
|
if (stat & OMAP_I2C_STAT_AL) {
|
||||||
dev_err(dev->dev, "Arbitration lost\n");
|
dev_err(dev->dev, "Arbitration lost\n");
|
||||||
err |= OMAP_I2C_STAT_AL;
|
err |= OMAP_I2C_STAT_AL;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -883,8 +880,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
|
||||||
OMAP_I2C_STAT_XRDY |
|
OMAP_I2C_STAT_XRDY |
|
||||||
OMAP_I2C_STAT_XDR |
|
OMAP_I2C_STAT_XDR |
|
||||||
OMAP_I2C_STAT_ARDY));
|
OMAP_I2C_STAT_ARDY));
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat & OMAP_I2C_STAT_RDR) {
|
if (stat & OMAP_I2C_STAT_RDR) {
|
||||||
|
@ -949,19 +945,19 @@ omap_i2c_isr(int this_irq, void *dev_id)
|
||||||
dev_err(dev->dev, "Receive overrun\n");
|
dev_err(dev->dev, "Receive overrun\n");
|
||||||
err |= OMAP_I2C_STAT_ROVR;
|
err |= OMAP_I2C_STAT_ROVR;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat & OMAP_I2C_STAT_XUDF) {
|
if (stat & OMAP_I2C_STAT_XUDF) {
|
||||||
dev_err(dev->dev, "Transmit underflow\n");
|
dev_err(dev->dev, "Transmit underflow\n");
|
||||||
err |= OMAP_I2C_STAT_XUDF;
|
err |= OMAP_I2C_STAT_XUDF;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
|
||||||
omap_i2c_complete_cmd(dev, err);
|
goto out;
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
}
|
||||||
} while (stat);
|
} while (stat);
|
||||||
|
|
||||||
|
out:
|
||||||
|
omap_i2c_complete_cmd(dev, err);
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue