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: 24951 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 44B3D2054E for ; Wed, 19 Feb 2014 12:09:28 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id gq1sf1037469obb.0 for ; Wed, 19 Feb 2014 04:09:27 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Sbffq/bah0QjVUP0mcwvqsXxQJBvVglcUwGf2ccfjsk=; b=FoIvmfk+puYI0vft4vwuwY71ilJrxjESUdrd4i5TX6sApxjVg7XyLPPP0Vz2L5sXRe fq6rdqDVG9pZudWKqLAFZ7zJYFMDihDnR0DW2krwtNUZWgHl0semE3VkPF4zNT4jo0vI Y8lUGgXOIeeRXfCTkYSN7MXlCgBWK2TVF3a7nh6E+ewKhKDLkl02RBJnjNJMzRAo6MPt DXMwzVzVK39ZLBwQBIyE51dS/Hw5uBqVRNT7Ggj2K2bZWFukvft2uQ0WZhzPA9Of6fKk Uk20Ewj6khc54CklzqIQS9hNTatItPYJdQbRlZJ78C+L/4hylaH9070k0Pgf1qpC3HWw Fr+w== X-Gm-Message-State: ALoCoQkaVSWn/DbWR3ZOrCvtZ8tAocuBqYueZa441qSD8eTVuFBsR1d3bh7BZMRmHtLzebZafeW/ X-Received: by 10.182.74.226 with SMTP id x2mr14888153obv.1.1392811767750; Wed, 19 Feb 2014 04:09:27 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.138 with SMTP id k10ls91801qge.66.gmail; Wed, 19 Feb 2014 04:09:27 -0800 (PST) X-Received: by 10.52.26.106 with SMTP id k10mr196463vdg.85.1392811767630; Wed, 19 Feb 2014 04:09:27 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id io9si6661062vcb.137.2014.02.19.04.09.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:09:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id oz11so269518veb.29 for ; Wed, 19 Feb 2014 04:09:27 -0800 (PST) X-Received: by 10.220.106.84 with SMTP id w20mr25220616vco.18.1392811767553; Wed, 19 Feb 2014 04:09:27 -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 u4csp292101vcz; Wed, 19 Feb 2014 04:09:27 -0800 (PST) X-Received: by 10.152.203.193 with SMTP id ks1mr26110281lac.0.1392811766588; Wed, 19 Feb 2014 04:09:26 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id m9si37712645lae.90.2014.02.19.04.09.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:09:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.182 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id w7so222590lbi.13 for ; Wed, 19 Feb 2014 04:09:26 -0800 (PST) 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 Cc: linux-arm-kernel@lists.infradead.org, Ulf Hansson , Russell King 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-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.128.170 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: , 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() */