Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a7ec4ed authored by Felipe Balbi's avatar Felipe Balbi Committed by Wolfram Sang
Browse files

i2c: omap: simplify IRQ exit path 



instead of having multiple return points, use
a goto statement to make that clearer.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 6a85ced2

drivers/i2c/busses/i2c-omap.c

+8 −12
Original line number Diff line number Diff line
@@ -853,24 +853,21 @@ omap_i2c_isr(int this_irq, void *dev_id) 
		dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);

		if (count++ == 100) {

			dev_warn(dev->dev, "Too much work in one IRQ\n");

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}



complete:

		if (stat & OMAP_I2C_STAT_NACK) {

			err |= OMAP_I2C_STAT_NACK;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}



		if (stat & OMAP_I2C_STAT_AL) {

			dev_err(dev->dev, "Arbitration lost\n");

			err |= OMAP_I2C_STAT_AL;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}



		/*
@@ -883,8 +880,7 @@ complete: 
						OMAP_I2C_STAT_XRDY |

						OMAP_I2C_STAT_XDR |

						OMAP_I2C_STAT_ARDY));

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}



		if (stat & OMAP_I2C_STAT_RDR) {
@@ -949,19 +945,19 @@ complete: 
			dev_err(dev->dev, "Receive overrun\n");

			err |= OMAP_I2C_STAT_ROVR;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}



		if (stat & OMAP_I2C_STAT_XUDF) {

			dev_err(dev->dev, "Transmit underflow\n");

			err |= OMAP_I2C_STAT_XUDF;

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);

			omap_i2c_complete_cmd(dev, err);

			return IRQ_HANDLED;

			goto out;

		}

	} while (stat);



out:

	omap_i2c_complete_cmd(dev, err);

	return IRQ_HANDLED;

}