Commit 265028b8 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: adc: stm32-adc: Use pm_runtime_resume_and_get() to replace open coding. 

Found using coccicheck script under review at:
https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/



This is a prequel to taking a closer look at the runtime pm in IIO drivers
in general.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Reviewed-by: default avatarFabrice Gasnier <fabrice.gasnier@foss.st.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/20210509113354.660190-15-jic23@kernel.org
parent 2d082b6e

drivers/iio/adc/stm32-adc.c

+8 −16
Original line number Diff line number Diff line
@@ -1158,11 +1158,9 @@ static int stm32_adc_single_conv(struct iio_dev *indio_dev, 


	adc->bufi = 0;



	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		pm_runtime_put_noidle(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		return ret;

	}



	/* Apply sampling time settings */

	stm32_adc_writel(adc, regs->smpr[0], adc->smpr_val[0]);
@@ -1364,11 +1362,9 @@ static int stm32_adc_update_scan_mode(struct iio_dev *indio_dev, 
	struct device *dev = indio_dev->dev.parent;

	int ret;



	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		pm_runtime_put_noidle(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		return ret;

	}



	adc->num_conv = bitmap_weight(scan_mask, indio_dev->masklength);
@@ -1413,11 +1409,9 @@ static int stm32_adc_debugfs_reg_access(struct iio_dev *indio_dev, 
	struct device *dev = indio_dev->dev.parent;

	int ret;



	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		pm_runtime_put_noidle(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		return ret;

	}



	if (!readval)

		stm32_adc_writel(adc, reg, writeval);
@@ -1537,11 +1531,9 @@ static int stm32_adc_buffer_postenable(struct iio_dev *indio_dev) 
	struct device *dev = indio_dev->dev.parent;

	int ret;



	ret = pm_runtime_get_sync(dev);

	if (ret < 0) {

		pm_runtime_put_noidle(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		return ret;

	}



	ret = stm32_adc_set_trig(indio_dev, indio_dev->trig);

	if (ret) {