From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guenter Roeck Subject: [PATCH v5 03/48] hibernate: Call have_kernel_power_off instead of checking pm_power_off Date: Thu, 6 Nov 2014 08:42:47 -0800 Message-ID: <1415292213-28652-4-git-send-email-linux@roeck-us.net> References: <1415292213-28652-1-git-send-email-linux@roeck-us.net> Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:56067 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbaKFQnr (ORCPT ); Thu, 6 Nov 2014 11:43:47 -0500 Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XmQ9z-000SRw-6L for linux-pm@vger.kernel.org; Thu, 06 Nov 2014 16:43:47 +0000 In-Reply-To: <1415292213-28652-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Guenter Roeck , "Rafael J. Wysocki" , Pavel Machek , Len Brown Power-off handlers may now be installed with register_power_off_handler. Use the new API function have_kernel_power_off to determine if a power-off handler has been installed. Cc: Rafael J. Wysocki Cc: Pavel Machek Cc: Len Brown Acked-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Guenter Roeck --- v5: - Rebase to v3.18-rc3 v4: - No change v3: - No change v2: - have_kernel_poweroff -> have_kernel_power_off kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 1f35a34..1202cf0 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -608,7 +608,7 @@ static void power_down(void) case HIBERNATION_PLATFORM: hibernation_platform_enter(); case HIBERNATION_SHUTDOWN: - if (pm_power_off) + if (have_kernel_power_off()) kernel_power_off(); break; #ifdef CONFIG_SUSPEND -- 1.9.1