Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0319f8b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

spi: bcm-qspi: fix suspend/resume #ifdef 



The two power management functions are define inside of an #ifdef
but referenced unconditionally, which is obviously broken when
CONFIG_PM_SLEEP is not set:

drivers/spi/spi-bcm-qspi.c:1300:13: error: 'bcm_qspi_suspend' undeclared here (not in a function)
drivers/spi/spi-bcm-qspi.c:1301:13: error: 'bcm_qspi_resume' undeclared here (not in a function)

This replaces the #ifdef with a __maybe_unused annotation that lets
the compiler figure out whether to drop the functions itself,
and uses SIMPLE_DEV_PM_OPS() to refer to the functions.

This will also fill the freeze/thaw/poweroff/restore callback
pointers in addition to suspend/resume, but as far as I can tell,
this is what we want.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: fa236a7e ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c0a75d07

drivers/spi/spi-bcm-qspi.c

+4 −8
Original line number Diff line number Diff line
@@ -1268,8 +1268,7 @@ int bcm_qspi_remove(struct platform_device *pdev) 
/* function to be called by SoC specific platform driver remove() */

EXPORT_SYMBOL_GPL(bcm_qspi_remove);



#ifdef CONFIG_PM_SLEEP

static int bcm_qspi_suspend(struct device *dev)

static int __maybe_unused bcm_qspi_suspend(struct device *dev)

{

	struct bcm_qspi *qspi = dev_get_drvdata(dev);
@@ -1280,7 +1279,7 @@ static int bcm_qspi_suspend(struct device *dev) 
	return 0;

};



static int bcm_qspi_resume(struct device *dev)

static int __maybe_unused bcm_qspi_resume(struct device *dev)

{

	struct bcm_qspi *qspi = dev_get_drvdata(dev);

	int ret = 0;
@@ -1293,12 +1292,9 @@ static int bcm_qspi_resume(struct device *dev) 


	return ret;

}

#endif /* CONFIG_PM_SLEEP */



const struct dev_pm_ops bcm_qspi_pm_ops = {

	.suspend = bcm_qspi_suspend,

	.resume  = bcm_qspi_resume,

};

SIMPLE_DEV_PM_OPS(bcm_qspi_pm_ops, bcm_qspi_suspend, bcm_qspi_resume);



/* pm_ops to be called by SoC specific platform driver */

EXPORT_SYMBOL_GPL(bcm_qspi_pm_ops);