From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752437Ab2CJVNa (ORCPT ); Sat, 10 Mar 2012 16:13:30 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:37429 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752298Ab2CJVNG (ORCPT ); Sat, 10 Mar 2012 16:13:06 -0500 From: "Rafael J. Wysocki" To: Konrad Rzeszutek Wilk Subject: Re: [PATCH 2/2] tboot: Add return values for tboot_sleep Date: Sat, 10 Mar 2012 22:17:13 +0100 User-Agent: KMail/1.13.6 (Linux/3.3.0-rc6+; KDE/4.6.0; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, x86@kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, linux-acpi@vger.kernel.org, lenb@kernel.org, joseph.cihula@intel.com References: <1331405526-25952-1-git-send-email-konrad.wilk@oracle.com> <1331405526-25952-3-git-send-email-konrad.wilk@oracle.com> In-Reply-To: <1331405526-25952-3-git-send-email-konrad.wilk@oracle.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Message-Id: <201203102217.13815.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Saturday, March 10, 2012, Konrad Rzeszutek Wilk wrote: > . as appropiately. As tboot_sleep now returns values. > remove tboot_sleep_wrapper. > > Suggested-by: "Rafael J. Wysocki" > Acked-by: Joseph Cihula > [v1: Return -1/0/+1 instead of ACPI_xx values] > Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Rafael J. Wysocki > --- > arch/x86/kernel/tboot.c | 13 ++++--------- > 1 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c > index 1a4ab7d..6410744 100644 > --- a/arch/x86/kernel/tboot.c > +++ b/arch/x86/kernel/tboot.c > @@ -272,7 +272,7 @@ static void tboot_copy_fadt(const struct acpi_table_fadt *fadt) > offsetof(struct acpi_table_facs, firmware_waking_vector); > } > > -void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > +static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > { > static u32 acpi_shutdown_map[ACPI_S_STATE_COUNT] = { > /* S0,1,2: */ -1, -1, -1, > @@ -281,7 +281,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > /* S5: */ TB_SHUTDOWN_S5 }; > > if (!tboot_enabled()) > - return; > + return 0; > > tboot_copy_fadt(&acpi_gbl_FADT); > tboot->acpi_sinfo.pm1a_cnt_val = pm1a_control; > @@ -292,15 +292,10 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > if (sleep_state >= ACPI_S_STATE_COUNT || > acpi_shutdown_map[sleep_state] == -1) { > pr_warning("unsupported sleep state 0x%x\n", sleep_state); > - return; > + return -1; > } > > tboot_shutdown(acpi_shutdown_map[sleep_state]); > -} > -static int tboot_sleep_wrapper(u8 sleep_state, u32 pm1a_control, > - u32 pm1b_control) > -{ > - tboot_sleep(sleep_state, pm1a_control, pm1b_control); > return 0; > } > > @@ -352,7 +347,7 @@ static __init int tboot_late_init(void) > atomic_set(&ap_wfs_count, 0); > register_hotcpu_notifier(&tboot_cpu_notifier); > > - acpi_os_set_prepare_sleep(&tboot_sleep_wrapper); > + acpi_os_set_prepare_sleep(&tboot_sleep); > return 0; > } > >