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: 24109 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E4F0C202FA for ; Tue, 4 Feb 2014 15:59:23 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oy12sf24451117veb.2 for ; Tue, 04 Feb 2014 07:59:23 -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=fcOIgnjbdbU2FUrs3MnjA2meaDRHP26q49pkghLWcvg=; b=eDYyJYpYbG8MqATenOBzsHLRnCCmIgQzJ2IsaNeLkTCnz92+KfuIyVicUm/5qDk8XX JPaGdW9KkwJxrgaPe009uDZVh/pZwZ2FQyMEgr8T/d7xlI983qoGfkDKjTtxt+vd1Yyc 1aCvcmreYrQ5JJbdqsTqocG65DjKJMydDBI4C0w9LA0oYwayOq0rElRIxWTy7ewWLqp5 9w8D5ZwhLH5kSBWjmYASuTWZR+5Yq6f7FF2cjhY2D+oBgMYYpeepYm+gNeDneG6Ek9xh fwlsWkOTlLlAN39pwc6UudJCSeW9CVRYBmBF4uSMQoTJ+A7h6w0nEp/ZX2jtPm5QNbJy EBWA== X-Gm-Message-State: ALoCoQns1NzKrlhJiN6dGOuql+/q892U3hZfLWt60s1XW90W0AovRry0gCbQB0q93teE/pFGJiiT X-Received: by 10.58.170.6 with SMTP id ai6mr15544211vec.7.1391529563080; Tue, 04 Feb 2014 07:59:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.135 with SMTP id r7ls2485962qgr.25.gmail; Tue, 04 Feb 2014 07:59:22 -0800 (PST) X-Received: by 10.58.169.7 with SMTP id aa7mr6842747vec.24.1391529562937; Tue, 04 Feb 2014 07:59:22 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id od9si8347867vcb.65.2014.02.04.07.59.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 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.52; Received: by mail-vb0-f52.google.com with SMTP id p14so5775754vbm.39 for ; Tue, 04 Feb 2014 07:59:22 -0800 (PST) X-Received: by 10.58.209.36 with SMTP id mj4mr371628vec.47.1391529562576; Tue, 04 Feb 2014 07:59:22 -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 u4csp245339vcz; Tue, 4 Feb 2014 07:59:21 -0800 (PST) X-Received: by 10.152.161.168 with SMTP id xt8mr303463lab.81.1391529561288; Tue, 04 Feb 2014 07:59:21 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id t10si12958129lat.57.2014.02.04.07.59.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:21 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.180 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so6643833lbi.11 for ; Tue, 04 Feb 2014 07:59:20 -0800 (PST) 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> 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.52 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 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