From patchwork Wed Jul 27 11:32:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 72859 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp251428qga; Wed, 27 Jul 2016 04:32:40 -0700 (PDT) X-Received: by 10.25.219.210 with SMTP id t79mr9808572lfi.110.1469619142665; Wed, 27 Jul 2016 04:32:22 -0700 (PDT) Return-Path: Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com. [2a00:1450:4010:c07::233]) by mx.google.com with ESMTPS id n3si2955308lfa.359.2016.07.27.04.32.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jul 2016 04:32:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) client-ip=2a00:1450:4010:c07::233; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::233 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x233.google.com with SMTP id g62so25075266lfe.3 for ; Wed, 27 Jul 2016 04:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6wfJERUk2sNamXkyujYHndN8EM7RsPNfw/BOLqw9S24=; b=egP2OfUPTxglmfTmCzkHrgfX8PJ4WHtS5IewMhHqTQdX7v5mPgmESRjJjDs4sQipdG 9HQ7uF+yVj0IFBwRupZzXO4TU9Npo5KciOGDzyCDRHXEhX/HQ7FOBnvTU1Tk8yKwlfBz IrW95cxY0I+UtXKzft/jHVpB37BfKLUbZeuvY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6wfJERUk2sNamXkyujYHndN8EM7RsPNfw/BOLqw9S24=; b=IrGyJpHnuwq0rIvIV7Ycvs2iAADh/tmbM6u70SfqO9JVYGEuv0LOwcGfewUWUA4jZz B0dLOI/V1PCmnHcRylLiPZmn4Ukch1CYo9fb5nSwJea6vsnqfcutrcBQHFJTvVz2agBl 5EbCv6tltYiLEhqFLINlszSkpkyCa8KaN+CjhGgAjXJHu5Gdx7Zab9rXoi36cLO1hO1F sPPjVhp8rYOrfLU2VzVf3wCj3lkEBiA8kzlEa9iiht1E1I68eHNNKRrxE/Xp4URTRpJb W01uxFloyIgF1ewae4d5Gkv+eqj+N9IwlVPk2uM/2he5dxFRJOMJwWkOCe5Px0tSVySo DfqA== X-Gm-Message-State: AEkoousaysYKJyx4z8uU1szm//OkB9iFqudt7OjkTa858wY3c9Bl263WzjaJAfdEZy37xQsmrMQ= X-Received: by 10.46.1.163 with SMTP id f35mr10868398lji.52.1469619142339; Wed, 27 Jul 2016 04:32:22 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-128-67.na.cust.bahnhof.se. [155.4.128.67]) by smtp.gmail.com with ESMTPSA id h62sm911164lji.28.2016.07.27.04.32.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 04:32:21 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter Cc: Arnd Bergmann , Dong Aisheng Subject: [PATCH 07/11] mmc: sdhci-esdhc-imx: Assign system PM ops within #ifdef CONFIG_PM_SLEEP Date: Wed, 27 Jul 2016 13:32:03 +0200 Message-Id: <1469619127-29283-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469619127-29283-1-git-send-email-ulf.hansson@linaro.org> References: <1469619127-29283-1-git-send-email-ulf.hansson@linaro.org> The system PM callbacks isn't used unless CONFIG_PM_SLEEP is set, thus it triggers a compiler warning about unused functions. Avoid this by changing from CONFIG_PM to CONFIG_PM_SLEEP. Reported-by: Arnd Bergmann Fixes: b70d0b3b5b29 ("mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback") Cc: Dong Aisheng Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-esdhc-imx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 2bb326b..f5768a6 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1293,7 +1293,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int sdhci_esdhc_suspend(struct device *dev) { return sdhci_pltfm_suspend(dev); @@ -1308,7 +1308,9 @@ static int sdhci_esdhc_resume(struct device *dev) return sdhci_pltfm_resume(dev); } +#endif +#ifdef CONFIG_PM static int sdhci_esdhc_runtime_suspend(struct device *dev) { struct sdhci_host *host = dev_get_drvdata(dev);