]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: dac: Remove redundant pm_runtime_mark_last_busy() calls
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 28 Aug 2025 14:06:17 +0000 (17:06 +0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 30 Aug 2025 19:50:21 +0000 (20:50 +0100)
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-redundant explicit call to
pm_runtime_mark_last_busy().

Also clean up error handling in stm32_dac_set_enable_state().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/20250828140617.3193288-1-sakari.ailus@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/dac/stm32-dac.c

index 344388338d9b029009ba2f04a2bae05ee43c64d0..b860e18d52a157d8023dd546396366ae7d23c094 100644 (file)
@@ -82,9 +82,11 @@ static int stm32_dac_set_enable_state(struct iio_dev *indio_dev, int ch,
 
        ret = regmap_update_bits(dac->common->regmap, STM32_DAC_CR, msk, en);
        mutex_unlock(&dac->lock);
-       if (ret < 0) {
+       if (ret) {
                dev_err(&indio_dev->dev, "%s failed\n", str_enable_disable(en));
-               goto err_put_pm;
+               if (enable)
+                       pm_runtime_put_autosuspend(dev);
+               return ret;
        }
 
        /*
@@ -95,20 +97,10 @@ static int stm32_dac_set_enable_state(struct iio_dev *indio_dev, int ch,
        if (en && dac->common->hfsel)
                udelay(1);
 
-       if (!enable) {
-               pm_runtime_mark_last_busy(dev);
+       if (!enable)
                pm_runtime_put_autosuspend(dev);
-       }
 
        return 0;
-
-err_put_pm:
-       if (enable) {
-               pm_runtime_mark_last_busy(dev);
-               pm_runtime_put_autosuspend(dev);
-       }
-
-       return ret;
 }
 
 static int stm32_dac_get_value(struct stm32_dac *dac, int channel, int *val)
@@ -349,7 +341,6 @@ static int stm32_dac_probe(struct platform_device *pdev)
        if (ret)
                goto err_pm_put;
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_put_autosuspend(dev);
 
        return 0;