From patchwork Thu Feb 20 15:31:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3688311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E5ED09F2EC for ; Thu, 20 Feb 2014 15:44:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17F4D2015A for ; Thu, 20 Feb 2014 15:44:32 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30D4420138 for ; Thu, 20 Feb 2014 15:44:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGVlu-0001o5-VJ; Thu, 20 Feb 2014 15:42:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGVco-0002UN-Rf; Thu, 20 Feb 2014 15:33:22 +0000 Received: from mail-we0-f170.google.com ([74.125.82.170]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WGVbY-0002Lg-0I for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2014 15:32:05 +0000 Received: by mail-we0-f170.google.com with SMTP id w62so1598804wes.29 for ; Thu, 20 Feb 2014 07:31:42 -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=eWkHS8vTj9WagKIWi4MVc9wFOn50PeCZSAq9UpTnDcM=; b=FVivCc7VfcxiecjKl4y0l6ZMnuW4Pb92Ecs/gplIfFr7xDa266TBeoaRq5csnuOADO L8qcnd0VzuEXTwfGyVZsW8eRF7lvjgljD3P25RvCQiM8Cnfl0tHOK7w2fDvy8bHHvMgK cVt8Jsc/IrSnCE6KNRvrLBH4rBnfgnUZN2o7nTUu9h0EwMuWYqBgt9/9xm6sMYq4nO+l WoJBXBBByn3J5WAXgucUU/F7xfmArv1JRf4fwo1pwDyZjuDo4LpLVtJZuNAT+Ygpi/Gs OAlxDNRQB9rtRhaOLn90ya/0+YzsRyxuHxTUfljwN1i7Anm3TSWvOhRGAbLakYc1E7yo zjHA== X-Gm-Message-State: ALoCoQkYmYnAtEMpjm/l0bIjNO/w02j6/Hl/cLkZjafzftxnIGSAIkXSgf0WLw2hjyzH0pi1j15x X-Received: by 10.194.92.7 with SMTP id ci7mr2632350wjb.58.1392910302329; Thu, 20 Feb 2014 07:31:42 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id h9sm9719799wjz.16.2014.02.20.07.31.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:41 -0800 (PST) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH 7/8] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Thu, 20 Feb 2014 16:31:19 +0100 Message-Id: <1392910280-12891-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392910280-12891-1-git-send-email-ulf.hansson@linaro.org> References: <1392910280-12891-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140220_103204_190387_A5DCF2C8 X-CRM114-Status: GOOD ( 12.99 ) X-Spam-Score: 0.4 (/) Cc: Ulf Hansson , Kevin Hilman , Russell King , Wolfram Sang , Linus Walleij , Mark Brown , Alan Stern , linux-arm-kernel@lists.infradead.org, Alessandro Rubini X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 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[] = {