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: 3140561 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 04FD4BEEB2 for ; Tue, 5 Nov 2013 12:10:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 762CC2061E for ; Tue, 5 Nov 2013 12:10:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C8612061C for ; Tue, 5 Nov 2013 12:10:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320Ab3KEMKR (ORCPT ); Tue, 5 Nov 2013 07:10:17 -0500 Received: from mail-wg0-f47.google.com ([74.125.82.47]:43590 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753728Ab3KEMKQ (ORCPT ); Tue, 5 Nov 2013 07:10:16 -0500 Received: by mail-wg0-f47.google.com with SMTP id c11so3288943wgh.26 for ; Tue, 05 Nov 2013 04:10:15 -0800 (PST) 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=QGU56uMEKj1Sjo2t7f7YUgYjcQcB/6uhJ3N9fmAcNKk=; b=kGHjYKLQk4OeoPiJo2VIyQ/kDAFoMdtSAU23tCHYmABthgY8W8XFSsBDQhAPSHwz8X JF+L8s/YkduwRE11nWiM7+W0SmmnI+VLbS6AxD5PFoE4apRppTZSHX2tAau9d26z6vc4 t/4pwYY09bvsQcK7d/SIYiPZ4Sm5iE8A+Mz7yHIlmjkTEhjWZcgc0vQ8lPWQSio1enpz WMXApA2dj0fEKRepn608AjjzPNkkNxHGH+1k92ffucWwPya0j3jho5KmgaKDc+RVyvOZ hQtlsYJooRmpKioV9jT8IMh98olAtxEwk8zi0XYbOqk68O9eeMNVyV9a1IMXA9k2G1Ys dBTQ== X-Gm-Message-State: ALoCoQnIb5FvDR+dtWsYxq7aOzhM1nDOWbE+eyjAR9km3TmWiQcm7W3rJSuFdlzTuXIVRg0+AfrA 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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");