Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1244678 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2015-10-12 15:10 +0200 |
| Last post | 2015-10-12 15:40 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] sata/mvebu: use #ifdef around suspend/resume code Arnd Bergmann <arnd@arndb.de> - 2015-10-12 15:10 +0200
Re: [PATCH] sata/mvebu: use #ifdef around suspend/resume code Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2015-10-12 15:30 +0200
Re: [PATCH] sata/mvebu: use #ifdef around suspend/resume code Arnd Bergmann <arnd@arndb.de> - 2015-10-12 15:40 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2015-10-12 15:10 +0200 |
| Subject | [PATCH] sata/mvebu: use #ifdef around suspend/resume code |
| Message-ID | <qiL1x-8hA-29@gated-at.bofh.it> |
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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
|---|---|
| Date | 2015-10-12 15:30 +0200 |
| Message-ID | <qiLkR-cI-3@gated-at.bofh.it> |
| In reply to | #1244678 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2015-10-12 15:40 +0200 |
| Message-ID | <qiLuy-ok-3@gated-at.bofh.it> |
| In reply to | #1244690 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web