lkml.org 
[lkml]   [2020]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 20/31] i2c: tegra: Rename variable in tegra_i2c_issue_bus_clear()
    Date
    Rename variable "reg" to "val" in order to better reflect the actual usage
    of the variable in the code and to make naming consistent with the rest of
    the code.

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

    diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
    index c2ff55e8db54..6ec6161a1895 100644
    --- a/drivers/i2c/busses/i2c-tegra.c
    +++ b/drivers/i2c/busses/i2c-tegra.c
    @@ -1100,21 +1100,21 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
    {
    struct tegra_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
    unsigned long time_left;
    - u32 reg;
    + u32 val;
    int err;

    reinit_completion(&i2c_dev->msg_complete);
    - reg = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND |
    + val = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND |
    I2C_BC_TERMINATE;
    - i2c_writel(i2c_dev, reg, I2C_BUS_CLEAR_CNFG);
    + i2c_writel(i2c_dev, val, I2C_BUS_CLEAR_CNFG);
    if (i2c_dev->hw->has_config_load_reg) {
    err = tegra_i2c_wait_for_config_load(i2c_dev);
    if (err)
    return err;
    }

    - reg |= I2C_BC_ENABLE;
    - i2c_writel(i2c_dev, reg, I2C_BUS_CLEAR_CNFG);
    + val |= I2C_BC_ENABLE;
    + i2c_writel(i2c_dev, val, I2C_BUS_CLEAR_CNFG);
    tegra_i2c_unmask_irq(i2c_dev, I2C_INT_BUS_CLR_DONE);

    time_left = tegra_i2c_wait_completion(i2c_dev, &i2c_dev->msg_complete,
    @@ -1124,8 +1124,8 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
    return -ETIMEDOUT;
    }

    - reg = i2c_readl(i2c_dev, I2C_BUS_CLEAR_STATUS);
    - if (!(reg & I2C_BC_STATUS)) {
    + val = i2c_readl(i2c_dev, I2C_BUS_CLEAR_STATUS);
    + if (!(val & I2C_BC_STATUS)) {
    dev_err(i2c_dev->dev,
    "un-recovered arbitration lost\n");
    return -EIO;
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-09-05 23:10    [W:2.673 / U:0.632 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site