i2c: tegra: make tegra_i2c_mutex_unlock() return void

tegra_i2c_mutex_unlock() returning an error that overwrites the transfer
result causes silent loss of I2C transfer errors. If the transfer failed
but the unlock succeeded, the error was lost and the function incorrectly
reported success.

Rather than propagating the unlock error (which is not actionable by the
caller - the I2C message may have been sent regardless), convert the
function to return void and WARN on the unexpected condition. If the
unlock fails, subsequent lock attempts will fail anyway, making the error
visible on the next transfer.

Fixes: 6077cfd716fb ("i2c: tegra: Add support for SW mutex register")
Signed-off-by: Saurav Sachidanand <sauravsc@amazon.com>
Cc: <stable@vger.kernel.org> # v7.0+
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260507221145.62183-3-sauravsc@amazon.com

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index c24b8de0a9c7b3ef43b32457a7a5e5e18102a97f..479a1667e88d57be9ff52e74a35ffe3426053238 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -589,25 +589,22 @@ static int tegra_i2c_mutex_lock(struct tegra_i2c_dev *i2c_dev)
        return ret;
 }
 
-static int tegra_i2c_mutex_unlock(struct tegra_i2c_dev *i2c_dev)
+static void tegra_i2c_mutex_unlock(struct tegra_i2c_dev *i2c_dev)
 {
        unsigned int reg = i2c_dev->hw->regs->sw_mutex;
        u32 val, id;
 
        if (!i2c_dev->hw->has_mutex)
-               return 0;
+               return;
 
        val = readl(i2c_dev->base + reg);
 
        id = FIELD_GET(I2C_SW_MUTEX_GRANT, val);
-       if (id && id != I2C_SW_MUTEX_ID_CCPLEX) {
-               dev_warn(i2c_dev->dev, "unable to unlock mutex, mutex is owned by: %u\n", id);
-               return -EPERM;
-       }
+       if (WARN(id && id != I2C_SW_MUTEX_ID_CCPLEX,
+                "unable to unlock mutex, mutex is owned by: %u\n", id))
+               return;
 
        writel(0, i2c_dev->base + reg);
-
-       return 0;
 }
 
 static void tegra_i2c_mask_irq(struct tegra_i2c_dev *i2c_dev, u32 mask)
@@ -1700,7 +1697,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
                        break;
        }
 
-       ret = tegra_i2c_mutex_unlock(i2c_dev);
+       tegra_i2c_mutex_unlock(i2c_dev);
        pm_runtime_put(i2c_dev->dev);
 
        return ret ?: i;