From patchwork Thu Feb 20 15:31:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 25062 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B7D9D203C6 for ; Thu, 20 Feb 2014 15:31:45 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf7847582oag.9 for ; Thu, 20 Feb 2014 07:31:44 -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=z7ItTzleQjDM8qGcsYOpaopZp0MWt5To/5tzjqmz1Xo=; b=XKXSE/prqjQv0L1fY9DXnb/si9txrn2BFhr8jAj7ZoMPL5zQdn+yFOnOgArwkLDmyT TRRtncRtpKxwB1Vp6Ri0vUGoNd9M+aEQntheY4tlzlfTGQWAMyUTABzgx+Zdx3ht0vpn k7DxZlDoRXskSOYYGoyFKXO1FiwrX/6xtENexWQg08YJ8EVfP8TQqVvBLCQXVtUa4UDF jpTGxb2nYZrw8nQdA7b0npgttfPAu3H+jIe5gdMqwgdCGZPTsz51DAZzLlGHYg9n/X+O hm4riN0E/dActAlHlRZ/7OtNrGRSTQ1FrUbLc5JZ4IcZlErV5/Fn2FnOthjuzCvL1kpC Y3rA== X-Gm-Message-State: ALoCoQkf4sguP31Y+5Uca6H7l6+6AYAA6StkZVrv+In0k6HwgfkN7f9CGSGlwJFk0ch8McDx6x/m X-Received: by 10.182.219.226 with SMTP id pr2mr967917obc.44.1392910304931; Thu, 20 Feb 2014 07:31:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.139 with SMTP id 11ls542539qgn.84.gmail; Thu, 20 Feb 2014 07:31:44 -0800 (PST) X-Received: by 10.52.172.39 with SMTP id az7mr1091990vdc.87.1392910304741; Thu, 20 Feb 2014 07:31:44 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id f5si1581954vej.111.2014.02.20.07.31.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:44 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id pa12so1963078veb.5 for ; Thu, 20 Feb 2014 07:31:44 -0800 (PST) X-Received: by 10.52.185.196 with SMTP id fe4mr1114453vdc.27.1392910304671; Thu, 20 Feb 2014 07:31:44 -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 u4csp67167vcz; Thu, 20 Feb 2014 07:31:40 -0800 (PST) X-Received: by 10.180.164.73 with SMTP id yo9mr3058008wib.29.1392910294982; Thu, 20 Feb 2014 07:31:34 -0800 (PST) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id w8si5155143wjf.41.2014.02.20.07.31.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:34 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.52; Received: by mail-wg0-f52.google.com with SMTP id b13so1590785wgh.19 for ; Thu, 20 Feb 2014 07:31:34 -0800 (PST) X-Received: by 10.194.234.106 with SMTP id ud10mr2772653wjc.0.1392910294433; Thu, 20 Feb 2014 07:31:34 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id h9sm9719799wjz.16.2014.02.20.07.31.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 07:31:33 -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 3/8] spi: pl022: Let runtime PM callbacks be available for CONFIG_PM Date: Thu, 20 Feb 2014 16:31:15 +0100 Message-Id: <1392910280-12891-4-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.128.174 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: Mark Brown Signed-off-by: Ulf Hansson --- drivers/spi/spi-pl022.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 74a0729..6dfcabf 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2277,7 +2277,7 @@ pl022_remove(struct amba_device *adev) return 0; } -#if defined(CONFIG_SUSPEND) || defined(CONFIG_PM_RUNTIME) +#ifdef CONFIG_PM /* * These two functions are used from both suspend/resume and * the runtime counterparts to handle external resources like @@ -2343,7 +2343,7 @@ static int pl022_resume(struct device *dev) } #endif /* CONFIG_PM */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int pl022_runtime_suspend(struct device *dev) { struct pl022 *pl022 = dev_get_drvdata(dev); @@ -2363,7 +2363,7 @@ static int pl022_runtime_resume(struct device *dev) static const struct dev_pm_ops pl022_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pl022_suspend, pl022_resume) - SET_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) + SET_PM_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) }; static struct vendor_data vendor_arm = {