From patchwork Tue Feb 4 15:58:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3577191 Return-Path: X-Original-To: patchwork-linux-arm@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 B5281C02DC for ; Tue, 4 Feb 2014 16:00:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B281120165 for ; Tue, 4 Feb 2014 16:00:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAF792016C for ; Tue, 4 Feb 2014 16:00:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAiPy-00010Y-SO; Tue, 04 Feb 2014 16:00:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAiPp-00068X-0R; Tue, 04 Feb 2014 16:00:01 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WAiPW-00064G-Uf for linux-arm-kernel@lists.infradead.org; Tue, 04 Feb 2014 15:59:43 +0000 Received: by mail-lb0-f177.google.com with SMTP id z5so6458751lbh.22 for ; Tue, 04 Feb 2014 07:59:20 -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=fcOIgnjbdbU2FUrs3MnjA2meaDRHP26q49pkghLWcvg=; b=UMItgRiJqNmJ6XjjpOwaBY4v1Cm9wNW2mAzuUlEeQpHV37vyX02HKV7aCeo00pigP0 p7e28cVeCdLFh3yvz/kW8SCL1yRq8OETqbIgBBjX6nfFzsjBDTasa8coRCKDUwRSKAkA 37YmD2VX/rLmzD7tNz0mJHx+9i4DWxBS9T490Erz0MLFwZbJYstjfndS4lFS1v0n6IQu oIgZtk76Smucky4RyWZhnAPEw9cu/h2Mnu7PUSyhkMZc6O9mN/sx/BfSIgoyuFAeUMC+ /DYvP6iSV0gpjhPe2PDi8/9NznLqcRABNPRdiQ5dDRTDFTDGjo4HHxy/KtlK9YHTA2X4 ZtyA== X-Gm-Message-State: ALoCoQkmjv8VlCW8wkTETJZheUMJqzf7t4LFQqk26cS11gK3H4v2TVWhpN0m0HiRIulXIgnrQacj X-Received: by 10.152.209.7 with SMTP id mi7mr2337446lac.42.1391529560344; Tue, 04 Feb 2014 07:59:20 -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.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:19 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/17] amba: Let runtime PM callbacks be available for CONFIG_PM Date: Tue, 4 Feb 2014 16:58:42 +0100 Message-Id: <1391529538-21685-2-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140204_105943_138319_28B619B0 X-CRM114-Status: GOOD ( 13.20 ) X-Spam-Score: -2.6 (--) Cc: Ulf Hansson , Wolfram Sang , Linus Walleij , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Ball , Mark Brown , linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, Alessandro Rubini X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 by drivers and power domains. Cc: Russell King Signed-off-by: Ulf Hansson --- drivers/amba/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 9e60291..3cf61a1 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -83,7 +83,7 @@ static struct device_attribute amba_dev_attrs[] = { __ATTR_NULL, }; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM /* * Hooks to provide runtime PM of the pclk (bus clock). It is safe to * enable/disable the bus clock at runtime PM suspend/resume as this @@ -123,7 +123,7 @@ static const struct dev_pm_ops amba_pm = { .thaw = pm_generic_thaw, .poweroff = pm_generic_poweroff, .restore = pm_generic_restore, - SET_RUNTIME_PM_OPS( + SET_PM_RUNTIME_PM_OPS( amba_pm_runtime_suspend, amba_pm_runtime_resume, NULL