From patchwork Sat Mar 1 10:56:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 25573 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FF64206A6 for ; Sat, 1 Mar 2014 10:56:36 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf4765972pbc.10 for ; Sat, 01 Mar 2014 02:56:35 -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=VvxHsncpAoS4n+21zirruUA5yhtSxwH0odzDblacdWrxsrrrzMCYIG4O7jS+rXRnoz s/qI3NyimEkAo7IaHPZwqyK/VfySWkyLGkGINkI28FYgwCy5tucFsQMijKqBodxEtUHE 2ahuKX+Wt9DBdne6saF0z1cJOmSd0Ca9+Yghgk91jgKhy74Jn2/jolo65VQ+yLyTTG+6 xbr5kwzmRAc5az30I/Az7uPrhmvjFgXzaAebyk8ld+K1r6ZYx6D83BB3WzOVZb6KsJoZ BkbAQMQULuEyvE0IpMGbmKqTMDFznMFt7ZF5lDfjUnl9ax9TvPrCOE9oq1dTzQMOkpjJ GkSw== X-Gm-Message-State: ALoCoQmMSymgLTSMpToxO9AWLNbvj4E7nzO/9zJULV5vPU9A8fkjgpZaXGxAMlK/WvYn8HFHo7sO X-Received: by 10.67.21.145 with SMTP id hk17mr3368215pad.35.1393671395688; Sat, 01 Mar 2014 02:56:35 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.246 with SMTP id e109ls1459491qga.89.gmail; Sat, 01 Mar 2014 02:56:35 -0800 (PST) X-Received: by 10.52.75.101 with SMTP id b5mr1298488vdw.40.1393671395558; Sat, 01 Mar 2014 02:56:35 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id si7si1641281vdc.63.2014.03.01.02.56.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:35 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id ij19so1820408vcb.20 for ; Sat, 01 Mar 2014 02:56:35 -0800 (PST) X-Received: by 10.59.5.102 with SMTP id cl6mr279275ved.41.1393671395452; Sat, 01 Mar 2014 02:56:35 -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.130.193 with SMTP id u1csp114213vcs; Sat, 1 Mar 2014 02:56:34 -0800 (PST) X-Received: by 10.112.63.193 with SMTP id i1mr1074960lbs.54.1393671394365; Sat, 01 Mar 2014 02:56:34 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id iz2si7930921lbc.61.2014.03.01.02.56.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:34 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.178 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id s7so3457546lbd.9 for ; Sat, 01 Mar 2014 02:56:33 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr1419077lal.46.1393671393578; Sat, 01 Mar 2014 02:56:33 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id qf1sm4532484lbc.8.2014.03.01.02.56.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:32 -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 , Greg Kroah-Hartman , Mark Brown , Russell King , Linus Walleij , Wolfram Sang , Alessandro Rubini , Josh Cartwright , Ulf Hansson Subject: [PATCH 7/8] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Sat, 1 Mar 2014 11:56:10 +0100 Message-Id: <1393671371-2398-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393671371-2398-1-git-send-email-ulf.hansson@linaro.org> References: <1393671371-2398-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.175 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[] = {