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: 25064 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6079E203C6 for ; Thu, 20 Feb 2014 15:31:48 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id z6sf1061468yhz.6 for ; Thu, 20 Feb 2014 07:31:48 -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=QYw1BAkmRdpl/7KdAupNrS2EsoveeyeTdBdQI4WEn2+sQjuWrYMxzkczAUtH7p+iyl AT7yWfpuaW0XhVQ0b/Ujo8T2OHxP4OV8y8T5B/GN4IywgVgblAPhhl32hpu/I7yn+mcZ c23YiDZSBBp/aphzVYlNQq8o5FXttKDd0rucrTE3si0cdCnhv5n4m337c2KwHC5/oDLv lo6hIbQacIRtG4eRc1Ci5kMnQr+I0tvLy5vHoEeIoGKrP6Ti2i4L8+ht44Jruhi+AHN4 ixhFzbNl9nJY4lEX/Eo0XfWAqn6qlGZ7i66VFUW9otGVT2S7Zj6s5chVtdarqKEhwmpJ 3VRQ== X-Gm-Message-State: ALoCoQnQm+t3OdoQyPBUHPIeEQvUfP6XELZgTVC3wLdDo3CCEYP5UOvprdMzghI6ChZ/ugo98OlR X-Received: by 10.236.70.202 with SMTP id p50mr827165yhd.18.1392910308020; Thu, 20 Feb 2014 07:31:48 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.9 with SMTP id l9ls603786qga.13.gmail; Thu, 20 Feb 2014 07:31:47 -0800 (PST) X-Received: by 10.220.98.204 with SMTP id r12mr1379405vcn.48.1392910307868; Thu, 20 Feb 2014 07:31:47 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id tr5si1577395vdc.117.2014.02.20.07.31.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so1996661vcb.30 for ; Thu, 20 Feb 2014 07:31:47 -0800 (PST) X-Received: by 10.52.246.227 with SMTP id xz3mr1093463vdc.95.1392910307793; Thu, 20 Feb 2014 07:31:47 -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 u4csp67184vcz; Thu, 20 Feb 2014 07:31:47 -0800 (PST) X-Received: by 10.180.25.46 with SMTP id z14mr3063949wif.49.1392910303216; Thu, 20 Feb 2014 07:31:43 -0800 (PST) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by mx.google.com with ESMTPS id fq9si3807456wib.64.2014.02.20.07.31.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:43 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.43 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.43; Received: by mail-wg0-f43.google.com with SMTP id a1so1597331wgh.10 for ; Thu, 20 Feb 2014 07:31:42 -0800 (PST) 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 Cc: linux-arm-kernel@lists.infradead.org, Kevin Hilman , Alan Stern , Mark Brown , Russell King , Linus Walleij , Wolfram Sang , Alessandro Rubini , Ulf Hansson 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-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.220.171 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[] = {