iio: imu: Remove redundant pm_runtime_mark_last_busy() calls

pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to
pm_runtime_mark_last_busy().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/20250825135401.1765847-8-sakari.ailus@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
index 7a28051330b79098bfa94b8c8c78c2bce20b7230..48014b61ced335eb2c8549cfc2e79ccde1934308 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
@@ -315,7 +315,6 @@ static int inv_icm42600_accel_read_sensor(struct iio_dev *indio_dev,
                ret = -EINVAL;
 exit:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }
@@ -567,7 +566,6 @@ static int inv_icm42600_accel_write_scale(struct iio_dev *indio_dev,
        ret = inv_icm42600_set_accel_conf(st, &conf, NULL);
 
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;
@@ -675,7 +673,6 @@ static int inv_icm42600_accel_write_odr(struct iio_dev *indio_dev,
 
 out_unlock:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;
@@ -727,7 +724,6 @@ static int inv_icm42600_accel_read_offset(struct inv_icm42600_state *st,
        memcpy(data, st->buffer, sizeof(data));
 
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        if (ret)
                return ret;
@@ -865,7 +861,6 @@ static int inv_icm42600_accel_write_offset(struct inv_icm42600_state *st,
 
 out_unlock:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
index ca744aaee5426cc1d9c548344b6a52dadb01a0b0..36d69a0face655bf2dc9229c52d07448e9b2ca02 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
@@ -430,7 +430,6 @@ out_unlock:
        if (sleep)
                msleep(sleep);
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
index 9ba6f13628e6af5e19d047476ae93754f07aa95f..8a7cc91276319f0b1714ad11d46e409688b258c4 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
@@ -184,7 +184,6 @@ static int inv_icm42600_gyro_read_sensor(struct inv_icm42600_state *st,
                ret = -EINVAL;
 exit:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }
@@ -283,7 +282,6 @@ static int inv_icm42600_gyro_write_scale(struct iio_dev *indio_dev,
        ret = inv_icm42600_set_gyro_conf(st, &conf, NULL);
 
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;
@@ -378,7 +376,6 @@ static int inv_icm42600_gyro_write_odr(struct iio_dev *indio_dev,
 
 out_unlock:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;
@@ -430,7 +427,6 @@ static int inv_icm42600_gyro_read_offset(struct inv_icm42600_state *st,
        memcpy(data, st->buffer, sizeof(data));
 
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        if (ret)
                return ret;
@@ -567,7 +563,6 @@ static int inv_icm42600_gyro_write_offset(struct inv_icm42600_state *st,
 
 out_unlock:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
        return ret;
 }

diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
index 8b15afca498cb5dfa7e056a60d3c78e419f11b29..6840073761786132e18b3f2ef3afbbd9789349dc 100644 (file)
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
@@ -37,7 +37,6 @@ static int inv_icm42600_temp_read(struct inv_icm42600_state *st, s16 *temp)
 
 exit:
        mutex_unlock(&st->lock);
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return ret;

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 39eb516acc7374d0a31e4e320e09d5cd878ca468..b2fa1f4957a5b95892777e6233903ecba4646d70 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -735,7 +735,6 @@ static int inv_mpu6050_read_channel_data(struct iio_dev *indio_dev,
                break;
        }
 
-       pm_runtime_mark_last_busy(pdev);
        pm_runtime_put_autosuspend(pdev);
 
        return ret;
@@ -938,7 +937,6 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
                break;
        }
 
-       pm_runtime_mark_last_busy(pdev);
        pm_runtime_put_autosuspend(pdev);
 error_write_raw_unlock:
        mutex_unlock(&st->lock);
@@ -1146,14 +1144,12 @@ static int inv_mpu6050_enable_wom(struct inv_mpu6050_state *st, bool en)
                        st->chip_config.wom_en = false;
                }
 
-               pm_runtime_mark_last_busy(pdev);
                pm_runtime_put_autosuspend(pdev);
        }
 
        return result;
 
 error_suspend:
-       pm_runtime_mark_last_busy(pdev);
        pm_runtime_put_autosuspend(pdev);
        return result;
 }
@@ -1249,7 +1245,6 @@ static int inv_mpu6050_write_event_value(struct iio_dev *indio_dev,
        value = (u64)val * 1000000ULL + (u64)val2;
        result = inv_mpu6050_set_wom_threshold(st, value, INV_MPU6050_FREQ_DIVIDER(st));
 
-       pm_runtime_mark_last_busy(pdev);
        pm_runtime_put_autosuspend(pdev);
 
        return result;
@@ -1357,7 +1352,6 @@ inv_mpu6050_fifo_rate_store(struct device *dev, struct device_attribute *attr,
        if (result)
                goto fifo_rate_fail_power_off;
 
-       pm_runtime_mark_last_busy(pdev);
 fifo_rate_fail_power_off:
        pm_runtime_put_autosuspend(pdev);
 fifo_rate_fail_unlock:

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index 5b1088cc3704f1ad1288a0d65b2f957b91455d7f..10a473342075933a3d485a6e5daa7d5a4d662c07 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -194,7 +194,6 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable)
                result = inv_mpu6050_prepare_fifo(st, false);
                if (result)
                        goto error_power_off;
-               pm_runtime_mark_last_busy(pdev);
                pm_runtime_put_autosuspend(pdev);
        }
 

diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 55c82891e08c1866dffc881944c3826643887ffb..3cd91d8a89eecafdf6c4ed66398ebef5f84e1cfe 100644 (file)
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -747,12 +747,10 @@ static int kmx61_set_power_state(struct kmx61_data *data, bool on, u8 device)
                data->mag_ps = on;
        }
 
-       if (on) {
+       if (on)
                ret = pm_runtime_resume_and_get(&data->client->dev);
-       } else {
-               pm_runtime_mark_last_busy(&data->client->dev);
+       else
                ret = pm_runtime_put_autosuspend(&data->client->dev);
-       }
        if (ret < 0) {
                dev_err(&data->client->dev,
                        "Failed: kmx61_set_power_state for %d, ret %d\n",