diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2020-09-30 01:19:01 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2020-10-05 22:57:42 +0200 |
commit | 055ba33154a755c0fe79ec174d3b6f9353e0be11 (patch) | |
tree | 56967936e49e635ff71ec79861eea671cbc3ac5e /drivers/i2c/busses/i2c-tegra.c | |
parent | 56f1cd34a4e7a2d10f41e8d8e27d16a157fdd74d (diff) | |
download | linux-stable-055ba33154a755c0fe79ec174d3b6f9353e0be11.tar.gz linux-stable-055ba33154a755c0fe79ec174d3b6f9353e0be11.tar.bz2 linux-stable-055ba33154a755c0fe79ec174d3b6f9353e0be11.zip |
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-tegra.c')
-rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 347651401cd6..dc25578adb6b 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -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); |