spi: bcm63xx: remove PM_SLEEP based conditional compilation

DhruvaG2000 · broonie · commit 25f061710949 · 2023-04-21T13:45:52.000+01:00
Get rid of conditional compilation based on CONFIG_PM_SLEEP because it may introduce build issues with certain configs where it maybe disabled This is because if above config is not enabled the suspend-resume functions are never part of the code but the bcm63xx_spi_pm_ops struct still inits them to non-existent suspend-resume functions. Fixes: b42dfed ("spi: add Broadcom BCM63xx SPI controller driver") Signed-off-by: Dhruva Gole <d-gole@ti.com> Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
@@ -617,7 +617,6 @@ static void bcm63xx_spi_remove(struct platform_device *pdev)
 	clk_disable_unprepare(bs->clk);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int bcm63xx_spi_suspend(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
@@ -644,7 +643,6 @@ static int bcm63xx_spi_resume(struct device *dev)
 
 	return 0;
 }
-#endif
 
 static const struct dev_pm_ops bcm63xx_spi_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume)

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,6 @@ static void bcm63xx_spi_remove(struct platform_device *pdev)`
`617`	`617`	`clk_disable_unprepare(bs->clk);`
`618`	`618`	`}`
`619`	`619`
`620`		`-#ifdef CONFIG_PM_SLEEP`
`621`	`620`	`static int bcm63xx_spi_suspend(struct device *dev)`
`622`	`621`	`{`
`623`	`622`	`struct spi_master *master = dev_get_drvdata(dev);`
`@@ -644,7 +643,6 @@ static int bcm63xx_spi_resume(struct device *dev)`
`644`	`643`
`645`	`644`	`return 0;`
`646`	`645`	`}`
`647`		`-#endif`
`648`	`646`
`649`	`647`	`static const struct dev_pm_ops bcm63xx_spi_pm_ops = {`
`650`	`648`	`SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume)`