From patchwork Tue Feb 4 15:58:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 24112 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5192B202FA for ; Tue, 4 Feb 2014 15:59:32 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf20565819qac.4 for ; Tue, 04 Feb 2014 07:59:31 -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=eWkHS8vTj9WagKIWi4MVc9wFOn50PeCZSAq9UpTnDcM=; b=j0gXOl3c+jSImUnuOxoOMkJJlTeKCjDa1LTRL+0fz6IQtn1Ix1K9Y6WUrcKDhpvkbE /87trC58WsLMu34FGTt88jJ1TNfacNinobF4kL8EmhgVWJOVNxYY848Lr1oq6gbtbG9J ryBdcnKJyq5j0XhqiB4+D6CqiMJPw3f3pRpNg1G/PDDlVhWvn1XfFnd9+Sg2AcGdYJQ9 oqrXcG8iZeGhOk4YCU6750j/fuGTi4h1kZsp59SnUHtfxPC7iJKNLs+9VupvjlgadG36 0bd72VFEU/l7MkHYHNFnrAwAyd1bMEa6UNmZxcOPdcEmmcYuYu8Gc3adqhZlIuzXgofe HiMQ== X-Gm-Message-State: ALoCoQmbuxh8gzyh2Uq6eVo/zwfeMQ9/Xy71yNhhQc5ycOJPNupETr9ijNyXEkXDTAg9EGkKTRYY X-Received: by 10.58.23.170 with SMTP id n10mr15718381vef.25.1391529571508; Tue, 04 Feb 2014 07:59:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.35 with SMTP id m32ls2229583qgd.81.gmail; Tue, 04 Feb 2014 07:59:31 -0800 (PST) X-Received: by 10.58.161.46 with SMTP id xp14mr564143veb.37.1391529571375; Tue, 04 Feb 2014 07:59:31 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id rl1si8346703vcb.74.2014.02.04.07.59.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 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.180; Received: by mail-ve0-f180.google.com with SMTP id db12so5986737veb.25 for ; Tue, 04 Feb 2014 07:59:31 -0800 (PST) X-Received: by 10.220.139.198 with SMTP id f6mr367473vcu.47.1391529571301; Tue, 04 Feb 2014 07:59:31 -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 u4csp245351vcz; Tue, 4 Feb 2014 07:59:30 -0800 (PST) X-Received: by 10.112.198.233 with SMTP id jf9mr65433lbc.88.1391529569485; Tue, 04 Feb 2014 07:59:29 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id uf1si12964338lbb.79.2014.02.04.07.59.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.50 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id ec20so6621880lab.37 for ; Tue, 04 Feb 2014 07:59:28 -0800 (PST) X-Received: by 10.152.219.37 with SMTP id pl5mr2484436lac.36.1391529568514; Tue, 04 Feb 2014 07:59:28 -0800 (PST) Received: from localhost.localdomain (host-95-199-220-119.mobileonline.telia.com. [95.199.220.119]) by mx.google.com with ESMTPSA id dm8sm35906603lad.7.2014.02.04.07.59.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:27 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alessandro Rubini , Linus Walleij , Wolfram Sang , Chris Ball , Mark Brown , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 04/17] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Tue, 4 Feb 2014 16:58:45 +0100 Message-Id: <1391529538-21685-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> References: <1391529538-21685-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.180 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: , Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM callbacks. This means the callbacks becomes available for both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed to handle the combinations of these scenarios. Cc: Russell King Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 178868a..c88da1c 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1753,7 +1753,7 @@ static int mmci_resume(struct device *dev) } #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static void mmci_save(struct mmci_host *host) { unsigned long flags; @@ -1821,7 +1821,7 @@ static int mmci_runtime_resume(struct device *dev) static const struct dev_pm_ops mmci_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume) - SET_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) + SET_PM_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) }; static struct amba_id mmci_ids[] = {