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: 316646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0D4B72C0091 for ; Wed, 5 Feb 2014 03:04:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbaBDQEL (ORCPT ); Tue, 4 Feb 2014 11:04:11 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:49299 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932087AbaBDP7f (ORCPT ); Tue, 4 Feb 2014 10:59:35 -0500 Received: by mail-la0-f41.google.com with SMTP id mc6so6652034lab.14 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=ZNCH8RuU2T2CSQcNVZhydekqjhneOBEIaKXmvlYHL0OzcvPz3VaL7sh8YY2H1FhLxZ tB8AHPS7V6JfEVNS8xJquTLSM5AuUgI/38+EY1Ydmyp3XMhsA3L6CxJ4jhtV1T06eYLY jdFDc472pkBSjPPXeGSvcpou+hiX63WXPMLNHxCMlhJplc2pbwNKWodGZ/rCfq6tBZZI o1NMEMpOp9gfSMPG7mcI6mmG/OhFDbA+dQ3oJ09q4rFBNmtNx59X8iXodhIYhlra5wfn Sm7N20HJQ2wjmhdmUhZW06r4p8p92FzR3jDZID4zWX951cTO5iqi85ppljtEFRC5eLpN ym/A== X-Gm-Message-State: ALoCoQnesTBzxm9upgsvCndyKnZf2v+3OIvBilJVpRlx1swQdJy0zGjH5JhkQemSpBG0CfhhcHy0 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-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 = {