linux-kernel - [PATCH] spi: bcm-qspi: fix build error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 18 Sep 2016 19:33:34 +0100
From:   Sudip Mukherjee <sudipm.mukherjee@...il.com>
To:     Mark Brown <broonie@...nel.org>
Cc:     linux-kernel@...r.kernel.org, linux-spi@...r.kernel.org,
        Sudip Mukherjee <sudipm.mukherjee@...il.com>
Subject: [PATCH] spi: bcm-qspi: fix build error

While building m68k allmodconfig, the build was failing with the error:

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

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

bcm_qspi_suspend() and bcm_qspi_resume() are only defined when
CONFIG_PM_SLEEP is defined. Use the macro SET_SYSTEM_SLEEP_PM_OPS to
use it only when CONFIG_PM_SLEEP is defined.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@...ethink.co.uk>
---

m68k build log is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/160355865

 drivers/spi/spi-bcm-qspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 8fff43e..f06a3824 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -1297,8 +1297,8 @@ static int bcm_qspi_resume(struct device *dev)
 #endif /* CONFIG_PM_SLEEP */
 
 const struct dev_pm_ops bcm_qspi_pm_ops = {
-	.suspend = bcm_qspi_suspend,
-	.resume  = bcm_qspi_resume,
+	SET_SYSTEM_SLEEP_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);
-- 
1.9.1