Improve coding style of the tegra_i2c_wait_for_config_load() function by
removing need to wrap code in order make it more readable and to adhere to
the common kernel coding style.

Signed-off-by: Dmitry Osipenko <dig...@gmail.com>
---
 drivers/i2c/busses/i2c-tegra.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index a2ae4dab8001..dc9948d816ac 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -700,25 +700,23 @@ static int tegra_i2c_wait_for_config_load(struct 
tegra_i2c_dev *i2c_dev)
        u32 val;
        int err;
 
-       if (i2c_dev->hw->has_config_load_reg) {
-               reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
-               addr = i2c_dev->base + reg_offset;
-               i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
-
-               if (i2c_dev->is_curr_atomic_xfer)
-                       err = readl_relaxed_poll_timeout_atomic(
-                                               addr, val, val == 0, 1000,
-                                               I2C_CONFIG_LOAD_TIMEOUT);
-               else
-                       err = readl_relaxed_poll_timeout(
-                                               addr, val, val == 0, 1000,
-                                               I2C_CONFIG_LOAD_TIMEOUT);
+       if (!i2c_dev->hw->has_config_load_reg)
+               return 0;
 
-               if (err) {
-                       dev_warn(i2c_dev->dev,
-                                "timeout waiting for config load\n");
-                       return err;
-               }
+       reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
+       addr = i2c_dev->base + reg_offset;
+       i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
+
+       if (i2c_dev->is_curr_atomic_xfer)
+               err = readl_relaxed_poll_timeout_atomic(addr, val, val == 0, 
1000,
+                                                       
I2C_CONFIG_LOAD_TIMEOUT);
+       else
+               err = readl_relaxed_poll_timeout(addr, val, val == 0, 1000,
+                                                I2C_CONFIG_LOAD_TIMEOUT);
+
+       if (err) {
+               dev_warn(i2c_dev->dev, "timeout waiting for config load\n");
+               return err;
        }
 
        return 0;
-- 
2.27.0

Reply via email to