From patchwork Thu Apr 10 13:01:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3964471 Return-Path: X-Original-To: patchwork-linux-arm@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 C0129BFF02 for ; Thu, 10 Apr 2014 19:34:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 054722082A for ; Thu, 10 Apr 2014 19:34:30 +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 0CB8920826 for ; Thu, 10 Apr 2014 19:34:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYJsU-0005fd-JM; Thu, 10 Apr 2014 18:39:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYJrm-0002gL-4e; Thu, 10 Apr 2014 18:38:26 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYJlw-0001zH-8o for linux-arm-kernel@merlin.infradead.org; Thu, 10 Apr 2014 18:32:24 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYIMb-0003pQ-T1 for linux-arm-kernel@lists.infradead.org; Thu, 10 Apr 2014 17:02:10 +0000 Received: by mail-wi0-f169.google.com with SMTP id hm4so1312034wib.0 for ; Thu, 10 Apr 2014 10:01:46 -0700 (PDT) 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=rRa3I+5JX31qfrFG59uMR1BjpjjsrMpyylfMA9KA7HY=; b=DFJ7hgziteS+wQw4vUZkSLjBpqMJve1NSbjZEuWO01MKQJjvxF1E/SCptMY1SNxviU KPqL8M9YrHGFSrqHzzpLp1E+aDKwclXDgOJvqCGIP+lxlh3NpgJrSUE0RvBbfE0+z5br /ScKkFvn0IrYxCOAadsdzmr9ckn46P43PJUWTQUB+ei5RNyVm4MNr3edp3GMo1ebu2Ly MFiR8BnNCUvagiBLHBn6D4EbN/WCZDVtPPe4psWxcl+KAKZibg1mgJ1mzzLeutqnADLA OLbkemYg0qAZfly6uOwbZIuy6YNFmZNjYJ7DDmuM+9j+LdGEUtJ2GJEW2HbeoLuht56A CiRA== X-Gm-Message-State: ALoCoQl3CSot7PLydk9uTq9qnHd0qNy9HUN6kQ96vd/FeXZD0FKhwIie3cGVYHZLtrfwGZgf4Htc X-Received: by 10.194.118.163 with SMTP id kn3mr1049774wjb.77.1397134899531; Thu, 10 Apr 2014 06:01:39 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id lb4sm6500371wjb.14.2014.04.10.06.01.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 06:01:38 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH 2/3] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Thu, 10 Apr 2014 15:01:31 +0200 Message-Id: <1397134892-20840-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397134892-20840-1-git-send-email-ulf.hansson@linaro.org> References: <1397134892-20840-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140410_100210_090161_3E36FE80 X-CRM114-Status: GOOD ( 12.19 ) X-Spam-Score: -0.7 (/) Cc: Linus Walleij , Kevin Hilman , Daniel Lezcano , Ulf Hansson 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=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 0f10e3c..eb23c89 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1789,7 +1789,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; @@ -1857,7 +1857,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[] = {