Commit 055ba331 authored Sep 30, 2020 by Dmitry Osipenko Committed by Wolfram Sang Oct 05, 2020

i2c: tegra: Remove likely/unlikely from the code



The likely/unlikely annotations should be used only in a hot paths of
performance-critical code. The I2C driver doesn't have such paths, and
thus, there is no justification for usage of likely/unlikely annotations
in the code. Hence remove them.

Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

parent 56f1cd34

drivers/i2c/busses/i2c-tegra.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -852,7 +852,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
		goto err;
		}

		if (unlikely(status & status_err)) {
		if (status & status_err) {
		tegra_i2c_disable_packet_mode(i2c_dev);
		if (status & I2C_INT_NO_ACK)
		i2c_dev->msg_err \|= I2C_ERR_NO_ACK;
		@@ -1294,7 +1294,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
		i2c_dev->msg_err);

		i2c_dev->is_curr_dma_xfer = false;
		if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
		if (i2c_dev->msg_err == I2C_ERR_NONE)
		return 0;

		tegra_i2c_init(i2c_dev);

Admin message