sata/mvebu: use #ifdef around suspend/resume code
PATCH RESEND v2 1/1 sata/mvebu: use #ifdef around suspend/resume code
The newly added suspend/resume implementation for ahci_mvebu causes a link error when CONFIG_PM_SLEEP 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.
---
The patch hasn't shown up in linux-next yet, but is still needed, resending.
Also fixed a typo in description.
drivers/ata/ahci_mvebu.c +5 -0
@@ -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_SLEEP 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 ,
Tejun Heo
AppliedQuoted 6 lines · Arnd Bergmann
The newly added suspend/resume implementation for
ahci_mvebucauses a link error whenCONFIG_PM_SLEEPis disabled:ERROR: "
ahci_platform_suspend_host" [drivers/ata/ahci_mvebu.ko] undefined!
ERROR: "ahci_platform_resume_host" [drivers/ata/ahci_mvebu.ko] undefined!
Quoted 6 lines
This adds the same #ifdef here that exists in the
ahci_platformdriver which defines the above functions.Signed-off-by Arnd Bergmann <[email protected]>Fixes d6ecf1581488 ("ata: ahci_mvebu: add suspend/resume support")Acked-by Thomas Petazzoni <[email protected]>
Applied to libata/for-4.4-fixes.
Thanks.
Signature · 1 line
tejun