On Mon, May 08, 2023 at 05:55:50PM +0530, Dhruva Gole wrote:
> Hi Greg,
>
> On 08/05/23 15:14, Greg Kroah-Hartman wrote:
> > From: Dhruva Gole <d-gole@xxxxxx>
> >
> > [ 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>
> > ---
> > drivers/spi/spi-bcm63xx.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
> > index 80fa0ef8909ca..0324ab3ce1c84 100644
> > --- a/drivers/spi/spi-bcm63xx.c
> > +++ b/drivers/spi/spi-bcm63xx.c
> > @@ -630,7 +630,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);
> > @@ -657,7 +656,6 @@ static int bcm63xx_spi_resume(struct device *dev)
> > return 0;
> > }
> > -#endif
>
> This patch may cause build failures with some of the configs that disable
> CONFIG_PM I understand,
> So to fix that I had sent another patch:
> https://lore.kernel.org/all/CAOiHx==anPTqXNJNG7zap1XP2zKUp5SbaVJdyUsUvvitKRUHZw@xxxxxxxxxxxxxx/
>
> However missed out adding the fixes tag.
>
> I humbly request you to add
> https://lore.kernel.org/all/20230424102546.1604484-1-d-gole@xxxxxx/
>
> this patch to fix this patch throughout the stable fixes trees.
>
> It can also be found on Linus' master branch here:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/spi/spi-bcm63xx.c?id=cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7
> > static const struct dev_pm_ops bcm63xx_spi_pm_ops = {
> > SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume)
Sure, now queued up, thanks!
greg k-h
