Patch "spi: bcm63xx: remove PM_SLEEP based conditional compilation" has been added to the 4.14-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    spi: bcm63xx: remove PM_SLEEP based conditional compilation

to the 4.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5d6d21696db98be3c7db3d076e3d87fa93cb24cf
Author: Dhruva Gole <d-gole@xxxxxx>
Date:   Thu Apr 20 17:46:15 2023 +0530

    spi: bcm63xx: remove PM_SLEEP based conditional compilation
    
    [ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ]
    
    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: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver")
    
    Signed-off-by: Dhruva Gole <d-gole@xxxxxx>
    Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@xxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index bfe5754768f97..c7b67388709fe 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -625,7 +625,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int bcm63xx_spi_suspend(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
@@ -652,7 +651,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)



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux