From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752540AbbJLNFi (ORCPT ); Mon, 12 Oct 2015 09:05:38 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:55310 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751983AbbJLNFf (ORCPT ); Mon, 12 Oct 2015 09:05:35 -0400 From: Arnd Bergmann To: Tejun Heo Cc: linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni Subject: [PATCH] sata/mvebu: use #ifdef around suspend/resume code Date: Mon, 12 Oct 2015 15:05:27 +0200 Message-ID: <5727002.l6plqmRKB3@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:a0VQMPtTWnRymrAY90IGGA9zQVdDyMRwgxvwvURH5FwoamK1pWx jRR7ixw9sKEYCodBbTkBnxqtfFQZ34NrOs03UAiTri0sm3biGtU1NoKox7CyuqQk9V83nti acUKnr64yLSAe+FXXxKgK4lpWRFHc4Zfjh7UtR3hcg272npp0B1zFZR9I2I105syYpAs5cv TxgeFEaRRJWtg3AA2DECg== X-UI-Out-Filterresults: notjunk:1;V01:K0:FqEcJ2x6Ib4=:kOr1E0ao12pKO9m3XtLWhC E6M/9H+RWtqmJC9ECtxR51MfKWFrHsGvxXeBwv9kfmPtnyh3BpBHc2DPC7Qun8JvKCx/6mCoU reDejFsxKuuqknsAyBvT8FWrdV6kB2p0zd9x/gfNQ+UA3wke6aaWQU6a15H+99qYdznSFkz47 djazpZBjF8CG5CPl8IDQ7lJ6TTWL13n6cdeLjiby1oIMqfY+04+rmePWvWcnR9DlrgDbdV+7Y kyvc2CqOz+hhohsDD6zX8aG7Q5/Pi9DRGCXJw/aNj4nKp9AfWmbzEfcBnQf86Tu8juwcBBXeM N8bfSA0gStoyVSoTeu5R3gAkBPOx7tDv6qWt++gmC4qblsTOp8LI4X8+IGvLigHuOF6y4c6B6 omodsS1tI2a09JRI3vW7R3/C3WUMNV4xo95ScFhXGyxbjDXu3E509om7K2B2MXnkkieubqo6m h1wsTXXASMGcYwtJk3qSuZaL1y/o2YT93klbDbaYwnfm18QNzMyyCUtUzfi0ThabE2m+a37PZ cp46Q3SxY7qOGvtV87WWwrhmRsURNVu6sED9OzhSjJu2Eumx/SW2fAOxHpoWWSSuYUxHkos4C RkjRdmSiF5k1UYf+cE2Z2y4O/RcL7MdKs1REgjllwpumkgceLfbIDFSL9+rMk6jCHMTy9S+da ZsUMGI/JwtusN8uw3VCetzOxo1ANn5NqMYzlBGuAGRvsbzhQGvUr52zJ32WPuHfI0URDYtJTF xqDtdv1fBo0Wd/bF 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") 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,