From patchwork Wed Feb 19 12:09:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3680701 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 F379CBF13A for ; Wed, 19 Feb 2014 12:35:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3729620158 for ; Wed, 19 Feb 2014 12:35:40 +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 3B2B020145 for ; Wed, 19 Feb 2014 12:35:39 +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 1WG5yM-0000vU-0K; Wed, 19 Feb 2014 12:09:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WG5yJ-00064H-LJ; Wed, 19 Feb 2014 12:09:51 +0000 Received: from mail-lb0-f176.google.com ([209.85.217.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WG5yH-00062z-Ke for linux-arm-kernel@lists.infradead.org; Wed, 19 Feb 2014 12:09:50 +0000 Received: by mail-lb0-f176.google.com with SMTP id w7so217842lbi.35 for ; Wed, 19 Feb 2014 04:09:26 -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; bh=Sbffq/bah0QjVUP0mcwvqsXxQJBvVglcUwGf2ccfjsk=; b=EAtRmebO4sfqfs2mIIm41vJXDpuvH2M+7SzOYJT0cyIfRX8m3ggBSP9aqfA7eejgy3 8JjrmD2tIev9u8OFdBpPRk34cbaKRnRdxiX8mMNSiIPPqFzD3PLGE/r3xmFqpf5yRB/Q dofA7Kecl5ch9Cgu9fJKreboT4f4KSHKSb/9aIdNnub7Xpym0f144rdPkeyia4YmoqOh /JYgpFCsH5AfFNxZ+MnlAZs5fyd3BaDelf7xMSDErBk9Py/Dwj35xgscRGrbLGhEbXnh sV84Y0AJhVyXXmz+MhJBBJOyH+QOQJ4ePpcrYSfQEFxKpqZeKVeWbP6ikGOUWqaJNiS7 6Gjw== X-Gm-Message-State: ALoCoQm8F9jFwFwslRqAyaUnIySpCfOx5ariwSSn+OsswY7bLWZ8s5tCVScg/IQ0q5VybgA199Zl X-Received: by 10.112.202.105 with SMTP id kh9mr270202lbc.89.1392811765964; Wed, 19 Feb 2014 04:09:25 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id jf8sm27325012lbc.8.2014.02.19.04.09.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:09:24 -0800 (PST) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH] PM / Sleep: Set pm_generic functions to NULL for !CONFIG_PM_SLEEP Date: Wed, 19 Feb 2014 13:09:21 +0100 Message-Id: <1392811761-28201-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140219_070949_815527_07E49322 X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Ulf Hansson , Russell King , linux-arm-kernel@lists.infradead.org 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 Previously only a subset of the functions were defined and set to NULL while !CONFIG_PM_SLEEP. Let's make them all available so they can be used no matter of CONFIG_PM_SLEEP or not. Cc: Russell King Signed-off-by: Ulf Hansson --- include/linux/pm.h | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/include/linux/pm.h b/include/linux/pm.h index db2be5f..a81b558 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -718,14 +718,26 @@ static inline void dpm_for_each_dev(void *data, void (*fn)(struct device *, void { } -#define pm_generic_prepare NULL -#define pm_generic_suspend NULL -#define pm_generic_resume NULL -#define pm_generic_freeze NULL -#define pm_generic_thaw NULL -#define pm_generic_restore NULL -#define pm_generic_poweroff NULL -#define pm_generic_complete NULL +#define pm_generic_prepare NULL +#define pm_generic_suspend_late NULL +#define pm_generic_suspend_noirq NULL +#define pm_generic_suspend NULL +#define pm_generic_resume_early NULL +#define pm_generic_resume_noirq NULL +#define pm_generic_resume NULL +#define pm_generic_freeze_noirq NULL +#define pm_generic_freeze_late NULL +#define pm_generic_freeze NULL +#define pm_generic_thaw_noirq NULL +#define pm_generic_thaw_early NULL +#define pm_generic_thaw NULL +#define pm_generic_restore_noirq NULL +#define pm_generic_restore_early NULL +#define pm_generic_restore NULL +#define pm_generic_poweroff_noirq NULL +#define pm_generic_poweroff_late NULL +#define pm_generic_poweroff NULL +#define pm_generic_complete NULL #endif /* !CONFIG_PM_SLEEP */ /* How to reorder dpm_list after device_move() */