From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752547AbbJLNfF (ORCPT ); Mon, 12 Oct 2015 09:35:05 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:52631 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054AbbJLNfC (ORCPT ); Mon, 12 Oct 2015 09:35:02 -0400 From: Arnd Bergmann To: Tejun Heo Cc: Thomas Petazzoni , linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] sata/mvebu: use #ifdef around suspend/resume code Date: Mon, 12 Oct 2015 15:34:55 +0200 Message-ID: <7247630.qs4EYWgH4t@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:NnanaPyyHMkBqLcCSMo3kLGAq1+Q7HW7T4VhEiAU0IZgGLDiR3/ jJmG79tXcRQfS657+1MGNLdm0jA6BOiBIE8qqSFG/CV0TRU4BajMhKwziwAa7S3OEPnu+ra 14exGBdd3wjKsGl/UpJ/bUSD4WwBM7JICja5hq/0gjt0ZkWPzkYZR0RIMkNjNNpjWx01is+ M//iiG1Hz0YIVXh7lcUlg== X-UI-Out-Filterresults: notjunk:1;V01:K0:d4+2NV1+sQ4=:+nCgZYD+EbM4kgHeyEPKUZ bGe7KCdpJj1VjpSuqJUDc4ce8slddv4sX2JCpRbUJHbA0W9CkdLXpye6z/l8Ulirf8rOgwrXe ErlwmPl/tWbArL9IjqpBtiwy5JkC9n2ugRFLDnMkWDNC6G7+gZr3urboKaI90hTKT6G7gByzY AKzAe93CsEcm1IYQZUh2RKqIqokQMmsCzR+KuloAt8+xuk15DoyTsxvpJ63FBsIYcADAVrfIz ASqwRC4HpH4fATEqLQEiab6wigegWwY++13av0igWdYvRa8CddQ7tpZRI2ArH9iwbiJ9dpyh7 Z1NCTWVWn4pb85f+6a2bSXlGnm7JoNHszJ/YoluP3vBolrMft224r6EMs5AGFCMzcDt/0TnQj 2x2de4K9Xbu54jkI3nNM+4i+I0A0gINDerCBL1ny1A73ur2Cv67O3RMG1e0zyd6MDB77ogyoY hP2zpbx+jcyoaQK5lG+FWIm/BTSOkHjiUUOqGvHeB+GPnkL3SVmS2ejN/2x8+BEMlFFMpjwWg XV1ELZlttDybFnpZVn/Lb1Pv5NcHt7V3/pRUpF4SJeK4DSRwGgQiYOO8Y0dwZni2YbTcStVo4 uuRA7b5XmQjuht6oxQEE4b+rQjQBmthn1cRhu41tiSFf8VlD+WbdAcFhRdn+3gN5kS0430u2D qbZG3tYZFycEGZn8H7b2YETCXdN/8/P2oCR3xd6FWOsY1m7mMEhBH6CI7L4EJKz5lLpfN4K8E C4QXxbZYldeblMAm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: d6ecf1581488 ("ata: ahci_mvebu: add suspend/resume support") --- v2: use the correct macro, thanks to Thomas for pointing it out! diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index 8490d37aee2a..f7a7fa81740e 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_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,