[PATCH v4 31/31] i2c: tegra: Rename couple "ret" variables to "err"

[Dmitry Osipenko]

Rename "ret" variables to "err" in order to make code a bit more
expressive, emphasizing that the returned value is a error code.

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

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index d389ea5813c3..2c84d5848e29 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -935,7 +935,7 @@ static void tegra_i2c_config_fifo_trig(struct tegra_i2c_dev 
*i2c_dev,
        unsigned long reg_offset;
        u32 val, reg, dma_burst;
        struct dma_chan *chan;
-       int ret;
+       int err;
 
        if (i2c_dev->hw->has_mst_fifo)
                reg = I2C_MST_FIFO_CONTROL;
@@ -975,9 +975,9 @@ static void tegra_i2c_config_fifo_trig(struct tegra_i2c_dev 
*i2c_dev,
                }
 
                slv_config.device_fc = true;
-               ret = dmaengine_slave_config(chan, &slv_config);
-               if (ret) {
-                       dev_err(i2c_dev->dev, "DMA config failed: %d\n", ret);
+               err = dmaengine_slave_config(chan, &slv_config);
+               if (err) {
+                       dev_err(i2c_dev->dev, "DMA config failed: %d\n", err);
                        dev_err(i2c_dev->dev, "falling back to PIO\n");
                        tegra_i2c_release_dma(i2c_dev);
                        i2c_dev->is_curr_dma_xfer = false;
@@ -1584,11 +1584,11 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev 
*i2c_dev)
 {
        struct device_node *np = i2c_dev->dev->of_node;
        bool multi_mode;
-       int ret;
+       int err;
 
-       ret = of_property_read_u32(np, "clock-frequency",
+       err = of_property_read_u32(np, "clock-frequency",
                                   &i2c_dev->bus_clk_rate);
-       if (ret)
+       if (err)
                i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
 
        multi_mode = of_property_read_bool(np, "multi-master");
@@ -1796,15 +1796,15 @@ static int tegra_i2c_remove(struct platform_device 
*pdev)
 static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
 {
        struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
-       int ret;
+       int err;
 
-       ret = pinctrl_pm_select_default_state(i2c_dev->dev);
-       if (ret)
-               return ret;
+       err = pinctrl_pm_select_default_state(i2c_dev->dev);
+       if (err)
+               return err;
 
-       ret = clk_bulk_enable(i2c_dev->nclocks, i2c_dev->clocks);
-       if (ret)
-               return ret;
+       err = clk_bulk_enable(i2c_dev->nclocks, i2c_dev->clocks);
+       if (err)
+               return err;
 
        /*
         * VI I2C device is attached to VE power domain which goes through
@@ -1812,8 +1812,8 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct 
device *dev)
         * controller needs to be re-initialized after power ON.
         */
        if (i2c_dev->is_vi) {
-               ret = tegra_i2c_init(i2c_dev);
-               if (ret)
+               err = tegra_i2c_init(i2c_dev);
+               if (err)
                        goto disable_clocks;
        }
 
@@ -1822,7 +1822,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct 
device *dev)
 disable_clocks:
        clk_bulk_disable(i2c_dev->nclocks, i2c_dev->clocks);
 
-       return ret;
+       return err;
 }
 
 static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev)
-- 
2.27.0