Commit d65daa79 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio:adc:stm32:Switch from CONFIG_PM guards to pm_ptr() 



Letting the compiler remove these functions when the kernel is built
without CONFIG_PM support is simpler and less error prone than the
use of #ifdef based config guards.

Removing instances of this approach from IIO also stops them being
copied into new drivers.

The new DEFINE_RUNTIME_DEV_PM_OPS() macro reduces boilerplate.

Reviewed-by: default avatarFabrice Gasnier <fabrice.gasnier@foss.st.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Olivier Moysan <olivier.moysan@foss.st.com>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-45-jic23@kernel.org
parent c62433f9

drivers/iio/adc/stm32-adc-core.c

+6 −11
Original line number Diff line number Diff line
@@ -763,7 +763,6 @@ static int stm32_adc_remove(struct platform_device *pdev) 
	return 0;

}



#if defined(CONFIG_PM)

static int stm32_adc_core_runtime_suspend(struct device *dev)

{

	stm32_adc_core_hw_stop(dev);
@@ -782,15 +781,11 @@ static int stm32_adc_core_runtime_idle(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops stm32_adc_core_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(stm32_adc_core_runtime_suspend,

static DEFINE_RUNTIME_DEV_PM_OPS(stm32_adc_core_pm_ops,

				stm32_adc_core_runtime_suspend,

				stm32_adc_core_runtime_resume,

			   stm32_adc_core_runtime_idle)

};

				stm32_adc_core_runtime_idle);



static const struct stm32_adc_priv_cfg stm32f4_adc_priv_cfg = {

	.regs = &stm32f4_adc_common_regs,
@@ -836,7 +831,7 @@ static struct platform_driver stm32_adc_driver = { 
	.driver = {

		.name = "stm32-adc-core",

		.of_match_table = stm32_adc_of_match,

		.pm = &stm32_adc_core_pm_ops,

		.pm = pm_ptr(&stm32_adc_core_pm_ops),

	},

};

module_platform_driver(stm32_adc_driver);

drivers/iio/adc/stm32-adc.c

+4 −8
Original line number Diff line number Diff line
@@ -2352,7 +2352,6 @@ static int stm32_adc_remove(struct platform_device *pdev) 
	return 0;

}



#if defined(CONFIG_PM_SLEEP)

static int stm32_adc_suspend(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);
@@ -2382,9 +2381,7 @@ static int stm32_adc_resume(struct device *dev) 


	return stm32_adc_buffer_postenable(indio_dev);

}

#endif



#if defined(CONFIG_PM)

static int stm32_adc_runtime_suspend(struct device *dev)

{

	return stm32_adc_hw_stop(dev);
@@ -2394,11 +2391,10 @@ static int stm32_adc_runtime_resume(struct device *dev) 
{

	return stm32_adc_hw_start(dev);

}

#endif



static const struct dev_pm_ops stm32_adc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(stm32_adc_suspend, stm32_adc_resume)

	SET_RUNTIME_PM_OPS(stm32_adc_runtime_suspend, stm32_adc_runtime_resume,

	SYSTEM_SLEEP_PM_OPS(stm32_adc_suspend, stm32_adc_resume)

	RUNTIME_PM_OPS(stm32_adc_runtime_suspend, stm32_adc_runtime_resume,

		       NULL)

};
@@ -2453,7 +2449,7 @@ static struct platform_driver stm32_adc_driver = { 
	.driver = {

		.name = "stm32-adc",

		.of_match_table = stm32_adc_of_match,

		.pm = &stm32_adc_pm_ops,

		.pm = pm_ptr(&stm32_adc_pm_ops),

	},

};

module_platform_driver(stm32_adc_driver);