* [PATCH] sata/mvebu: use #ifdef around suspend/resume code
@ 2015-10-12 13:05 Arnd Bergmann
2015-10-12 13:27 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2015-10-12 13:05 UTC (permalink / raw)
To: linux-arm-kernel
The newly added suspend/resume implementation for ahci_mvebu causes
a link error when CONFIG_PM_SUSPEND is disabled:
ERROR: "ahci_platform_suspend_host" [drivers/ata/ahci_mvebu.ko] undefined!
ERROR: "ahci_platform_resume_host" [drivers/ata/ahci_mvebu.ko] undefined!
This adds the same #ifdef here that exists in the ahci_platform driver
which defines the above functions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: d6ecf1581488 ("ata: ahci_mvebu: add suspend/resume support")
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 8490d37aee2a..5745bcce5e77 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -62,6 +62,7 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv)
writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA);
}
+#ifdef CONFIG_PM_SUSPEND
static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state)
{
return ahci_platform_suspend_host(&pdev->dev);
@@ -81,6 +82,10 @@ static int ahci_mvebu_resume(struct platform_device *pdev)
return ahci_platform_resume_host(&pdev->dev);
}
+#else
+#define ahci_mvebu_suspend NULL
+#define ahci_mvebu_resume NULL
+#endif
static const struct ata_port_info ahci_mvebu_port_info = {
.flags = AHCI_FLAG_COMMON,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] sata/mvebu: use #ifdef around suspend/resume code
2015-10-12 13:05 [PATCH] sata/mvebu: use #ifdef around suspend/resume code Arnd Bergmann
@ 2015-10-12 13:27 ` Thomas Petazzoni
2015-10-12 13:32 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2015-10-12 13:27 UTC (permalink / raw)
To: linux-arm-kernel
Arnd,
On Mon, 12 Oct 2015 15:05:27 +0200, Arnd Bergmann wrote:
> +#ifdef CONFIG_PM_SUSPEND
Shouldn't this be CONFIG_PM_SLEEP ?
The generic suspend/resume function in libahci_platform.c are defined
when CONFIG_PM_SLEEP is enabled.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] sata/mvebu: use #ifdef around suspend/resume code
2015-10-12 13:27 ` Thomas Petazzoni
@ 2015-10-12 13:32 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2015-10-12 13:32 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 12 October 2015 15:27:03 Thomas Petazzoni wrote:
> Arnd,
>
> On Mon, 12 Oct 2015 15:05:27 +0200, Arnd Bergmann wrote:
>
> > +#ifdef CONFIG_PM_SUSPEND
>
> Shouldn't this be CONFIG_PM_SLEEP ?
>
> The generic suspend/resume function in libahci_platform.c are defined
> when CONFIG_PM_SLEEP is enabled.
>
Right, I'll send a fixed version, please ignore this one!
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-12 13:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-12 13:05 [PATCH] sata/mvebu: use #ifdef around suspend/resume code Arnd Bergmann
2015-10-12 13:27 ` Thomas Petazzoni
2015-10-12 13:32 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).