From patchwork Mon Aug 25 12:25:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 35903 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 06B84203C0 for ; Mon, 25 Aug 2014 12:26:39 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id v1sf46120918yhn.0 for ; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) 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=8qyqb3gzqUMccfIH5yHsDXrlqWnLt03098+fE0rbKnk=; b=l7II4j7ToJppqyHvhfbaqh5Y7i4I+qTdWqJ3hklZIjWESdtlMAM6+Ih8Ojob6J0ePo QqxuXj2oUTPYU8z1+/hiuOgo0AQaEvdXAsHAD346vwvrCnhkv6UckP4crQC5hBanlZ4y fZZTOkMRhGiTMQt8PJsvswLeVM4q+wUN4wISLjpTWNB3zQa1PkRkbBbv3+yoP97i0eeb 15/y+0B9xpzU0FAPEeWMg2LYtt5Uy0ssyX+DJbtN46LNfvkq1L9vDR3SfZWfd2K7JjjE YBYjIXCnYs7ci+8a+Ys1fnAKKKRf/EPkGHXFfu12UFc5fDF/4wOsd5GzIZU+VzbNx41v LYSg== X-Gm-Message-State: ALoCoQmbSfdPQ2cAjjTlZwpWCsqK8hyTtYiibyYwUUrGE8es32LJt85xR7UGEnoNMeBT9nBoIScb X-Received: by 10.236.227.169 with SMTP id d39mr1006190yhq.45.1408969598853; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.70 with SMTP id g64ls2095866qgf.85.gmail; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) X-Received: by 10.221.62.195 with SMTP id xb3mr5347245vcb.45.1408969598761; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id sf7si17217009vdb.19.2014.08.25.05.26.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 05:26:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so15128788vcb.33 for ; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) X-Received: by 10.52.94.108 with SMTP id db12mr15330356vdb.8.1408969598458; Mon, 25 Aug 2014 05:26:38 -0700 (PDT) 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.221.45.67 with SMTP id uj3csp113264vcb; Mon, 25 Aug 2014 05:26:37 -0700 (PDT) X-Received: by 10.194.11.10 with SMTP id m10mr8824270wjb.77.1408969597415; Mon, 25 Aug 2014 05:26:37 -0700 (PDT) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx.google.com with ESMTPS id x16si119030wia.7.2014.08.25.05.26.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 05:26:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 74.125.82.182 as permitted sender) client-ip=74.125.82.182; Received: by mail-we0-f182.google.com with SMTP id k48so13194412wev.13 for ; Mon, 25 Aug 2014 05:26:36 -0700 (PDT) X-Received: by 10.180.218.4 with SMTP id pc4mr15299846wic.15.1408969596596; Mon, 25 Aug 2014 05:26:36 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u5sm145337wia.17.2014.08.25.05.26.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 05:26:36 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ian Molton , Chris Ball Cc: Geert Uytterhoeven , Linux-sh list , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH 07/12] mmc: tmio: Make runtime PM callbacks available for CONFIG_PM Date: Mon, 25 Aug 2014 14:25:59 +0200 Message-Id: <1408969564-6335-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408969564-6335-1-git-send-email-ulf.hansson@linaro.org> References: <1408969564-6335-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) 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: , To give the option for tmio hosts to use the runtime PM callbacks for CONFIG_PM_SLEEP as well as CONFIG_PM_RUNTIME, move them to CONFIG_PM. Signed-off-by: Ulf Hansson --- drivers/mmc/host/tmio_mmc.h | 2 +- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index f1ee3e4..2ad52d6 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -149,7 +149,7 @@ int tmio_mmc_host_suspend(struct device *dev); int tmio_mmc_host_resume(struct device *dev); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev); int tmio_mmc_host_runtime_resume(struct device *dev); #endif diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index d52280d..494ecc5 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1162,7 +1162,7 @@ int tmio_mmc_host_resume(struct device *dev) EXPORT_SYMBOL(tmio_mmc_host_resume); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev);