diff options
| author | Benoît Monin | 2026-01-30 16:52:30 +0100 |
|---|---|---|
| committer | Andi Shyti | 2026-02-04 02:16:16 +0100 |
| commit | 4a5aa00980131c2de520e6fe3fae9b8fe16f93a5 (patch) | |
| tree | e2f711209d9cb2751a1f8060416cd5fd4b0280a6 /drivers/i2c | |
| parent | 470f1a71e60cf94202c66c96a658944b58beac45 (diff) | |
i2c: designware: Use runtime PM macro for auto-cleanup
Simplify runtime PM handling in i2c_dw_xfer_common() by using the
pm_runtime_active_auto_try guard. This adds the proper handling for
runtime PM resume errors and allows us to get rid of the done and
done_nolock labels.
Also use the dedicated PM_RUNTIME macros in amd_i2c_dw_xfer_quirk()
instead of ACQUIRE()/ACQUIRE_ERR().
Signed-off-by: Benoît Monin <benoit.monin@bootlin.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260130-i2c-dw-v6-2-08ca1e9ece07@bootlin.com
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-master.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index a466511dadd4..73d9347a6a08 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -296,8 +296,8 @@ static int amd_i2c_dw_xfer_quirk(struct dw_i2c_dev *dev, struct i2c_msg *msgs, i u8 *tx_buf; unsigned int val; - ACQUIRE(pm_runtime_active_auto_try, pm)(dev->dev); - if (ACQUIRE_ERR(pm_runtime_active_auto_try, &pm)) + PM_RUNTIME_ACQUIRE_AUTOSUSPEND(dev->dev, pm); + if (PM_RUNTIME_ACQUIRE_ERR(&pm)) return -ENXIO; /* @@ -846,11 +846,13 @@ i2c_dw_xfer_common(struct dw_i2c_dev *dev, struct i2c_msg msgs[], int num) dev_dbg(dev->dev, "msgs: %d\n", num); - pm_runtime_get_sync(dev->dev); + PM_RUNTIME_ACQUIRE_AUTOSUSPEND(dev->dev, pm); + if (PM_RUNTIME_ACQUIRE_ERR(&pm)) + return -ENXIO; ret = i2c_dw_acquire_lock(dev); if (ret) - goto done_nolock; + return ret; /* * If the I2C_M_STOP is present in some the messages, @@ -866,13 +868,15 @@ i2c_dw_xfer_common(struct dw_i2c_dev *dev, struct i2c_msg msgs[], int num) for (cnt = 1; ; cnt++) { if (!i2c_dw_msg_is_valid(dev, msgs_part, cnt - 1)) { ret = -EINVAL; - goto done; + break; } if ((msgs_part[cnt - 1].flags & I2C_M_STOP) || (msgs_part + cnt == msgs + num)) break; } + if (ret < 0) + break; /* transfer one part up to a STOP */ ret = __i2c_dw_xfer_one_part(dev, msgs_part, cnt); @@ -880,14 +884,10 @@ i2c_dw_xfer_common(struct dw_i2c_dev *dev, struct i2c_msg msgs[], int num) break; } -done: i2c_dw_set_mode(dev, DW_IC_SLAVE); i2c_dw_release_lock(dev); -done_nolock: - pm_runtime_put_autosuspend(dev->dev); - if (ret < 0) return ret; return num; |