From patchwork Sat Mar 1 10:56:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 25569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1B6DD206A6 for ; Sat, 1 Mar 2014 10:56:27 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf10481756iec.8 for ; Sat, 01 Mar 2014 02:56:26 -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=dH5N8hw0lQrZh4DD92FIvmWTJGDeL/DPxTWmyuoUMjHIexFigx1ZkNjVgufeIAM5C9 FWL5Qs03/Xc1x3sZBVv5enpZvPjocKnPk9H84WhBP4sLO7VuAzJaeUcLBTQm9svAAz7n uWbE7QgYxUt3pWEyXK7DM8yOrJIxkwq+RUAUtqgDAEIzRM7qIHdJnSb6hYPpeyFzZ4aZ fGMyUSFpRFwiPW8I8LZ/y3w3n/Jbc5mGayPepSiKzaAjpWd+hN00GrhVSxpQ4HwCivvM 8nf33mZkFGEL+f6b904Yt4tiUjOp5b2fe8QmJGGmwWQBEbVDPYUji2jJY6fJbCSO+RyM Gcdw== X-Gm-Message-State: ALoCoQl09oiaoCvUaoA9SkPXFI3breF/eD6Mt6DRAzSUZ5d0UPUYguRRUm+w/Jx09zdsQCICezPo X-Received: by 10.42.51.141 with SMTP id e13mr6374826icg.28.1393671386511; Sat, 01 Mar 2014 02:56:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.203 with SMTP id t69ls1510588qgd.87.gmail; Sat, 01 Mar 2014 02:56:26 -0800 (PST) X-Received: by 10.58.66.137 with SMTP id f9mr6939901vet.11.1393671386413; Sat, 01 Mar 2014 02:56:26 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id xn9si2891975vcb.41.2014.03.01.02.56.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id db12so1900459veb.10 for ; Sat, 01 Mar 2014 02:56:26 -0800 (PST) X-Received: by 10.52.30.167 with SMTP id t7mr9037833vdh.36.1393671386299; Sat, 01 Mar 2014 02:56:26 -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 u1csp114208vcs; Sat, 1 Mar 2014 02:56:25 -0800 (PST) X-Received: by 10.152.21.4 with SMTP id r4mr1126324lae.51.1393671384901; Sat, 01 Mar 2014 02:56:24 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id rd2si14681894lac.99.2014.03.01.02.56.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.172 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id c11so3416257lbj.17 for ; Sat, 01 Mar 2014 02:56:24 -0800 (PST) X-Received: by 10.152.5.136 with SMTP id s8mr882750las.55.1393671384192; Sat, 01 Mar 2014 02:56:24 -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.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 02:56:23 -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 3/8] spi: pl022: Let runtime PM callbacks be available for CONFIG_PM Date: Sat, 1 Mar 2014 11:56:06 +0100 Message-Id: <1393671371-2398-4-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.128.179 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 = {