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: 316647 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 DEAC62C0091 for ; Wed, 5 Feb 2014 03:04:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754644AbaBDP71 (ORCPT ); Tue, 4 Feb 2014 10:59:27 -0500 Received: from mail-lb0-f169.google.com ([209.85.217.169]:50045 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754558AbaBDP7W (ORCPT ); Tue, 4 Feb 2014 10:59:22 -0500 Received: by mail-lb0-f169.google.com with SMTP id q8so6595991lbi.14 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=d2y2J36SigzWg01amYop343TqFbwc3iqwFdDbAZf6fsRvePkWOH+mSB1OnFEYCqiQO acm2FsPyB76d21OiOaxz8JghK5sWmJHAYbRQ/Ttv4aBmRvj+5PLCvdyH6lGR0DctfaYo OaqEw2HOQRn4qekwDTNlv2s8jjMJPd97WB4tpT3XPnOzfPx1pyD07WS62XUxMx4rojlQ lyFr7/6d6OkGJvGNxcMIfaWnWArYGOqXEvN5qKnjnZS3QuQW2nLaunI7I6uq1XmvGLv6 MCUf5+tgBkbV848mRHCtEeH7Q4LeZMtYn0C0Cjss54uZo/cimG3DiWaBHf3+4S6FB01m OmFg== X-Gm-Message-State: ALoCoQkMkzgjfGJkZk4foGg40HJkGvgRiohR0HcftG+yAmWPNYJYwBrqAjLkqDqPuYC/U6o3rLdG 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 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 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> 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 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