@@ -905,11 +905,13 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
dev_dbg(dev->dev, "msgs: %d\n", num);
- pm_runtime_get_sync(dev->dev);
+ ACQUIRE(pm_runtime_active_auto_try, pm)(dev->dev);
+ if (ACQUIRE_ERR(pm_runtime_active_auto_try, &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,
@@ -923,13 +925,15 @@ i2c_dw_xfer(struct i2c_adapter *adap, 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);
@@ -937,12 +941,8 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
break;
}
-done:
i2c_dw_release_lock(dev);
-done_nolock:
- pm_runtime_put_autosuspend(dev->dev);
-
if (ret < 0)
return ret;
return num;
Simplify runtime PM handling in i2c_dw_xfer() 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. Signed-off-by: Benoît Monin <benoit.monin@bootlin.com> --- drivers/i2c/busses/i2c-designware-master.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)