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: 3577561 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D00CBC02DC for ; Tue, 4 Feb 2014 16:04:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C8A1200EC for ; Tue, 4 Feb 2014 16:04:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AF2420158 for ; Tue, 4 Feb 2014 16:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753440AbaBDQEL (ORCPT ); Tue, 4 Feb 2014 11:04:11 -0500 Received: from mail-la0-f43.google.com ([209.85.215.43]:61771 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932088AbaBDP7g (ORCPT ); Tue, 4 Feb 2014 10:59:36 -0500 Received: by mail-la0-f43.google.com with SMTP id pv20so6765080lab.30 for ; Tue, 04 Feb 2014 07:59:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6Y1cCaF5cA3sJJjCsBSi9wZq9EghLnMVLndvxrvjnSg=; b=h35LU0shLBIyCMA1ifzWgs5FIYqfHK8G4I6qVsJu2LHFTDShWL39wQYXhAkJSxK2rX 62Cmczl8IWLKCi6OQteRvz2KQ1tQP8Ozesd6GzMSq1k+2wGX3l6H8eSiQKDOyplCBitj U+V8rzwW/PP0L3s1gud0yuKOp63hH3o8ltjxMPVASEMuQb9vTWNQg8JEjtAePNsEgtDj 2LZIodYXJrOf9DI9asmDS/F4zEqENOMIOATNdOnRnbXJMFqqYWBeK3XFzuTm0OX2NcIh pWLjKxbs8Yx548DOpN64902Lrj7wLc2OjeFcSn4ZLa2v+MsOObPQXoDWQcz5s9FSXrHY 7NpA== X-Gm-Message-State: ALoCoQlgZLNhwe4bGQnz6TAs0yJmmdyxm+P2F5FG2bxZfGxX7mDkx4z9Tulu6NAEa9v/Y1k/qJ3g 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> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 = {