From patchwork Tue Nov 5 12:10:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 21333 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3117525E12 for ; Tue, 5 Nov 2013 12:10:17 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf25335128iej.8 for ; Tue, 05 Nov 2013 04:10:16 -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=QGU56uMEKj1Sjo2t7f7YUgYjcQcB/6uhJ3N9fmAcNKk=; b=LauLX0rttb1vI6VYB0O52BCZ++1UcIhDiYiB46CMaPZnfrxOHqeMwpVIqBDIQhJUzX KpCrdKLpW6AwgDwPgI3Qj005DAZPGqTvsI6QiGFw/bG0wzzwgK2Nm9tLXD7vlYe08SwM +gwH+d6gbnlxDnYIpWCNa+ci5OZYY94ehGJwHE+SLYcghAlo20INYHFQJItaeWQmodxI CfRxKjb76lqMRwaymxVtLxJWsDb9Q+BRl+T7MBxQN9VbYg+l6gPekHDqBOrirpKEk6u3 Zg2j0urlx8IeOxt5zvMJg4DM9Ho+GxMxFYK7bXBRGPQBIFNUfAek6JYAObjJgNY2IiwU nErw== X-Gm-Message-State: ALoCoQk07+fdYoagqjMmHzMusePSB8jDSEOKYYadWkjNHIMNFvc/9vZc2QrNpr/84TvqYBLDz9cp X-Received: by 10.182.186.105 with SMTP id fj9mr7270158obc.5.1383653416790; Tue, 05 Nov 2013 04:10:16 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.194 with SMTP id k2ls169810qej.45.gmail; Tue, 05 Nov 2013 04:10:16 -0800 (PST) X-Received: by 10.58.168.205 with SMTP id zy13mr8238527veb.19.1383653416673; Tue, 05 Nov 2013 04:10:16 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id hs8si5063848veb.60.2013.11.05.04.10.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Nov 2013 04:10:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id cz12so2434168veb.10 for ; Tue, 05 Nov 2013 04:10:16 -0800 (PST) X-Received: by 10.220.147.20 with SMTP id j20mr7140272vcv.21.1383653416595; Tue, 05 Nov 2013 04:10:16 -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 u4csp202053vcz; Tue, 5 Nov 2013 04:10:16 -0800 (PST) X-Received: by 10.180.12.45 with SMTP id v13mr16354743wib.57.1383653415811; Tue, 05 Nov 2013 04:10:15 -0800 (PST) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by mx.google.com with ESMTPS id ev9si2225405wib.74.2013.11.05.04.10.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Nov 2013 04:10:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.170 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.212.170; Received: by mail-wi0-f170.google.com with SMTP id ex4so3222060wid.3 for ; Tue, 05 Nov 2013 04:10:15 -0800 (PST) X-Received: by 10.180.37.164 with SMTP id z4mr16717244wij.30.1383653415384; Tue, 05 Nov 2013 04:10:15 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id e1sm13925599wij.6.2013.11.05.04.10.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Nov 2013 04:10:14 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball , Guennadi Liakhovetski , Ian Molton Cc: Ulf Hansson Subject: [PATCH 3/3] mmc: tmio: Adapt to proper PM configs for exported functions Date: Tue, 5 Nov 2013 13:10:03 +0100 Message-Id: <1383653403-10049-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383653403-10049-1-git-send-email-ulf.hansson@linaro.org> References: <1383653403-10049-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.179 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 --- 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");