Commit f7f292fe authored Oct 23, 2022 by Paul Cercueil Committed by Lee Jones Dec 07, 2022

mfd: stmpe: Remove #ifdef guards for PM related functions



Use the new EXPORT_GPL_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros
to handle the .suspend/.resume callbacks.

These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Lee Jones <lee@kernel.org>

parent 4d8a6ae2

drivers/mfd/stmpe-i2c.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -115,9 +115,7 @@ MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id);
		static struct i2c_driver stmpe_i2c_driver = {
		.driver = {
		.name = "stmpe-i2c",
		#ifdef CONFIG_PM
		.pm = &stmpe_dev_pm_ops,
		#endif
		.pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
		.of_match_table = stmpe_of_match,
		},
		.probe_new = stmpe_i2c_probe,

drivers/mfd/stmpe-spi.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -135,9 +135,7 @@ static struct spi_driver stmpe_spi_driver = {
		.driver = {
		.name = "stmpe-spi",
		.of_match_table = of_match_ptr(stmpe_spi_of_match),
		#ifdef CONFIG_PM
		.pm = &stmpe_dev_pm_ops,
		#endif
		.pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
		},
		.probe = stmpe_spi_probe,
		.remove = stmpe_spi_remove,

drivers/mfd/stmpe.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -1495,7 +1495,6 @@ void stmpe_remove(struct stmpe *stmpe)
		mfd_remove_devices(stmpe->dev);
		}

		#ifdef CONFIG_PM
		static int stmpe_suspend(struct device *dev)
		{
		struct stmpe *stmpe = dev_get_drvdata(dev);
		@@ -1516,8 +1515,5 @@ static int stmpe_resume(struct device *dev)
		return 0;
		}

		const struct dev_pm_ops stmpe_dev_pm_ops = {
		.suspend = stmpe_suspend,
		.resume = stmpe_resume,
		};
		#endif
		EXPORT_GPL_SIMPLE_DEV_PM_OPS(stmpe_dev_pm_ops,
		stmpe_suspend, stmpe_resume);