iio: pressure: icp10100: Balance runtime pm + use pm_runtime_resume_and_get()
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 16 May 2021 16:21:03 +0000 (17:21 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 16 Jun 2021 13:53:13 +0000 (14:53 +0100)
The devm_ handled runtime pm disable calls pm_runtime_put_sync_suspend()
which isn't balancing a matching get call.  It isn't a bug as such,
because the runtime pm core doesn't decrement the reference count below
zero, but it is missleading so let's drop it.

Using pm_runtime_resume_and_get() new call makes it easy to handle
failures in resume as it doesn't hold a reference count if it exits
with an error.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/20210516162103.1332291-7-jic23@kernel.org
drivers/iio/pressure/icp10100.c

index 48759fc..af4621e 100644 (file)
@@ -250,7 +250,9 @@ static int icp10100_get_measures(struct icp10100_state *st,
        __be16 measures[3];
        int ret;
 
-       pm_runtime_get_sync(&st->client->dev);
+       ret = pm_runtime_resume_and_get(&st->client->dev);
+       if (ret < 0)
+               return ret;
 
        mutex_lock(&st->lock);
        cmd = &icp10100_cmd_measure[st->mode];
@@ -525,7 +527,6 @@ static void icp10100_pm_disable(void *data)
 {
        struct device *dev = data;
 
-       pm_runtime_put_sync_suspend(dev);
        pm_runtime_disable(dev);
 }