mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 14:41:22 -05:00
iio: dac: 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-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>
This commit is contained in:
committed by
Jonathan Cameron
parent
dfbbee0907
commit
7c873e3f04
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user