Commit 4060c6e5 authored by Paul Cercueil's avatar Paul Cercueil Committed by Lee Jones
Browse files

mfd: motorola-cpcap: Remove #ifdef guards for PM related functions 



Use the new DEFINE_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: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent ef72ed42

drivers/mfd/motorola-cpcap.c

+2 −4
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static const struct regmap_config cpcap_regmap_config = { 
	.val_format_endian = REGMAP_ENDIAN_LITTLE,

};



#ifdef CONFIG_PM_SLEEP

static int cpcap_suspend(struct device *dev)

{

	struct spi_device *spi = to_spi_device(dev);
@@ -239,9 +238,8 @@ static int cpcap_resume(struct device *dev) 


	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(cpcap_pm, cpcap_suspend, cpcap_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(cpcap_pm, cpcap_suspend, cpcap_resume);



static const struct mfd_cell cpcap_mfd_devices[] = {

	{
@@ -346,7 +344,7 @@ static struct spi_driver cpcap_driver = { 
	.driver = {

		.name = "cpcap-core",

		.of_match_table = cpcap_of_match,

		.pm = &cpcap_pm,

		.pm = pm_sleep_ptr(&cpcap_pm),

	},

	.probe = cpcap_probe,

	.id_table = cpcap_spi_ids,