From patchwork Tue Feb 4 15:58:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 24113 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8AF56202FA for ; Tue, 4 Feb 2014 15:59:37 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id h16sf38562039oag.4 for ; Tue, 04 Feb 2014 07:59:36 -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=6Y1cCaF5cA3sJJjCsBSi9wZq9EghLnMVLndvxrvjnSg=; b=RF0NRp1015+qP/hm7zkViBm0+idhERUMFGKCnbG/Gi2hSr075jvCZGEEqTQdJswDXI h5/6ZGQCMFIcdIz7rz05SWSn6vtcPwb25o1qh3qRd6UhCr6laIL0fz/A6bQ9hObOGNS1 pYoIr/3elV6cGCDeNaDduUrmybbQ01mdA5MEmnq6Ze87LhmR81/QGUmYz1UEOaVSKWOj 0czeDLjxMuIoRmqoQEmem0CJ8ElBjE2aiYgxfKd1eC2hlTlir8awP2GszAU32jrSOOh4 feBlOSfAmvfuMrf03ycDtIJDko5m80Jqn2e6Q2/URVjtTjkj94DBiHPAOfscL7qSPypx MZwA== X-Gm-Message-State: ALoCoQmd3YyB6o/osJo1qHL35ty7Dy73F0Wkwfqn1UEwMyyUgD6wlIKYa6MRd+SuocpMEU6+yxE7 X-Received: by 10.50.154.73 with SMTP id vm9mr8135514igb.2.1391529576628; Tue, 04 Feb 2014 07:59:36 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.117 with SMTP id 108ls972711qgw.77.gmail; Tue, 04 Feb 2014 07:59:36 -0800 (PST) X-Received: by 10.52.186.197 with SMTP id fm5mr15929vdc.85.1391529576551; Tue, 04 Feb 2014 07:59:36 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id ks3si8310681vec.51.2014.02.04.07.59.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id m10so5859880vbh.18 for ; Tue, 04 Feb 2014 07:59:36 -0800 (PST) X-Received: by 10.58.255.233 with SMTP id at9mr10372829ved.20.1391529576459; Tue, 04 Feb 2014 07:59:36 -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 u4csp245358vcz; Tue, 4 Feb 2014 07:59:35 -0800 (PST) X-Received: by 10.152.242.131 with SMTP id wq3mr10026515lac.12.1391529574987; Tue, 04 Feb 2014 07:59:34 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id n3si12942895lae.154.2014.02.04.07.59.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:34 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.50 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id ec20so6732035lab.9 for ; Tue, 04 Feb 2014 07:59:34 -0800 (PST) X-Received: by 10.112.56.173 with SMTP id b13mr576749lbq.77.1391529574154; Tue, 04 Feb 2014 07:59:34 -0800 (PST) Received: from localhost.localdomain (host-95-199-220-119.mobileonline.telia.com. [95.199.220.119]) by mx.google.com with ESMTPSA id dm8sm35906603lad.7.2014.02.04.07.59.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:33 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alessandro Rubini , Linus Walleij , Wolfram Sang , Chris Ball , Mark Brown , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 06/17] spi: pl022: Let runtime PM callbacks be available for CONFIG_PM Date: Tue, 4 Feb 2014 16:58:47 +0100 Message-Id: <1391529538-21685-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> References: <1391529538-21685-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.212.45 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 2789b45..70fa907 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2288,7 +2288,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 @@ -2354,7 +2354,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); @@ -2374,7 +2374,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 = {