From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbdA3RVo (ORCPT ); Mon, 30 Jan 2017 12:21:44 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36746 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750730AbdA3RVm (ORCPT ); Mon, 30 Jan 2017 12:21:42 -0500 From: Thierry Reding To: Linus Torvalds , Greg Kroah-Hartman , "Rafael J . Wysocki" , Pavel Machek Cc: Sebastian Reichel , Guenter Roeck , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC 3/3] PM / hibernate: Wire up system-power framework Date: Mon, 30 Jan 2017 18:15:06 +0100 Message-Id: <20170130171506.3527-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170130171506.3527-1-thierry.reding@gmail.com> References: <20170130171506.3527-1-thierry.reding@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding Use the system-power framework's equivalent to test for power off capability instead of relying on the globally defined pm_power_off() function pointer. The system-power framework implements a fallback that relies on this global function in case no system power chips have been registered. Moving this to the system-power framework allows us to eventually remove any traces of pm_power_off() once all handlers have moved over to the new framework. Signed-off-by: Thierry Reding --- kernel/power/hibernate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26dbc48c75b..e7429ea11e9a 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "power.h" @@ -617,7 +618,7 @@ static void power_down(void) case HIBERNATION_PLATFORM: hibernation_platform_enter(); case HIBERNATION_SHUTDOWN: - if (pm_power_off) + if (system_can_power_off()) kernel_power_off(); break; #ifdef CONFIG_SUSPEND -- 2.11.0