From patchwork Fri Nov 8 06:06:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 21417 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f69.google.com (mail-qe0-f69.google.com [209.85.128.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C8655244F2 for ; Fri, 8 Nov 2013 06:06:29 +0000 (UTC) Received: by mail-qe0-f69.google.com with SMTP id 6sf2439533qeb.8 for ; Thu, 07 Nov 2013 22:06:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=7Ia9mH2azTKQJsd4B7nAzBGMTTg86m0+wry1im9a0eE=; b=Bi9azPr4j4Yr1NU5OfGSuU3bXehD8Py+aYn9WKUjErvfq43CKY2EVdoK9ZgBMv/1vf XO73CjoxrFBb21hZ54aV6aTiuxZbP++/IATzmK3QigqpBU0v3ZyPqF7EqgT75MkKD/Mm l6Y7UG1A9b9s9i8ERf+JRPwktM2KCOp/XlU9fBRMdPlaHiUrWNRcslj9uRz3FpKCivXa c7exXP5gym/cLOHBhY/GTfT+oWdsNKbNmpqi/Yh2/R/a3kI3hn8WqAzHjEN+OdnKbr34 vUU/h8K3aAFzx/t4gVb07NsWrxWGsnJ4kFqpQ0wEOQqNVSbdn8bZnHrFQwa7gUKbTLr4 Bs/g== X-Gm-Message-State: ALoCoQnKKM97n+GjZdtwfFU9w+w+fMj7i5FsjhCazjBE8mXU5TFkhGpd7gyPuOV9ERPFcvf7O1Wt X-Received: by 10.52.172.239 with SMTP id bf15mr1172284vdc.8.1383890789698; Thu, 07 Nov 2013 22:06:29 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.68 with SMTP id f4ls1569618qer.72.gmail; Thu, 07 Nov 2013 22:06:29 -0800 (PST) X-Received: by 10.52.33.69 with SMTP id p5mr8619523vdi.28.1383890789575; Thu, 07 Nov 2013 22:06:29 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id rp4si3274142vcb.36.2013.11.07.22.06.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Nov 2013 22:06:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id cz12so1164188veb.3 for ; Thu, 07 Nov 2013 22:06:29 -0800 (PST) X-Received: by 10.52.64.143 with SMTP id o15mr8646363vds.16.1383890789369; Thu, 07 Nov 2013 22:06:29 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp6963vcz; Thu, 7 Nov 2013 22:06:28 -0800 (PST) X-Received: by 10.112.134.3 with SMTP id pg3mr9362321lbb.11.1383890788321; Thu, 07 Nov 2013 22:06:28 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id z5si2868555laj.94.2013.11.07.22.06.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Nov 2013 22:06:28 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.41 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id ea20so1394979lab.28 for ; Thu, 07 Nov 2013 22:06:27 -0800 (PST) X-Received: by 10.152.22.97 with SMTP id c1mr233009laf.31.1383890787751; Thu, 07 Nov 2013 22:06:27 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id f4sm6860209lah.0.2013.11.07.22.06.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Nov 2013 22:06:27 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 3/8] mmc: tmio: Adapt to proper PM configs for exported functions Date: Fri, 8 Nov 2013 07:06:11 +0100 Message-Id: <1383890776-6912-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383890776-6912-1-git-send-email-ulf.hansson@linaro.org> References: <1383890776-6912-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since the users of the exported PM functions are now using the modern PM ops macros, we can convert to the proper corresponding PM configs. Signed-off-by: Ulf Hansson Acked-by: Guennadi Liakhovetski --- drivers/mmc/host/tmio_mmc.h | 7 +++---- drivers/mmc/host/tmio_mmc_pio.c | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 86fd21e..6c5b45a 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -163,16 +163,15 @@ static inline void tmio_mmc_abort_dma(struct tmio_mmc_host *host) } #endif -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP int tmio_mmc_host_suspend(struct device *dev); int tmio_mmc_host_resume(struct device *dev); -#else -#define tmio_mmc_host_suspend NULL -#define tmio_mmc_host_resume NULL #endif +#ifdef CONFIG_PM_RUNTIME int tmio_mmc_host_runtime_suspend(struct device *dev); int tmio_mmc_host_runtime_resume(struct device *dev); +#endif static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr) { diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index f3b2d8c..472e803 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1140,7 +1140,7 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) } EXPORT_SYMBOL(tmio_mmc_host_remove); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP int tmio_mmc_host_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); @@ -1163,9 +1163,9 @@ int tmio_mmc_host_resume(struct device *dev) return 0; } EXPORT_SYMBOL(tmio_mmc_host_resume); +#endif -#endif /* CONFIG_PM */ - +#ifdef CONFIG_PM_RUNTIME int tmio_mmc_host_runtime_suspend(struct device *dev) { return 0; @@ -1182,5 +1182,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev) return 0; } EXPORT_SYMBOL(tmio_mmc_host_runtime_resume); +#endif MODULE_LICENSE("GPL v2");