2.6.28-mmotm1230 drivers/acpi/hardware/hwsleep.c warning msg

[Valdis . Kletnieks]

In mmotm1230 the linux.next patch, most likely via this commit:

commit ecd196686aee5028f71ee09072c8581c7293a847
Author: Len Brown <len.brown@xxxxxxxxx>
Date:   Fri Dec 19 03:53:37 2008 -0500

    ACPICA: disable ACPI 2.0 _GTS/_BFS support

added some warning messages:

  CC      drivers/acpi/hardware/hwsleep.o
drivers/acpi/hardware/hwsleep.c: In function â??acpi_enter_sleep_stateâ??:
drivers/acpi/hardware/hwsleep.c:231: warning: unused variable â??argâ??
drivers/acpi/hardware/hwsleep.c:230: warning: unused variable â??arg_listâ??
drivers/acpi/hardware/hwsleep.c: In function â??acpi_leave_sleep_state_prepâ??:
drivers/acpi/hardware/hwsleep.c:471: warning: unused variable â??argâ??
drivers/acpi/hardware/hwsleep.c:470: warning: unused variable â??arg_listâ

If we're going to #ifdef-wrap the code, let's do the variables involved
as well, so we don't get warnings.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@xxxxxx>

--- linux-2.6.28-mmotm1230/drivers/acpi/hardware/hwsleep.c.dist	2009-01-01 17:22:49.000000000 -0500
+++ linux-2.6.28-mmotm1230/drivers/acpi/hardware/hwsleep.c	2009-01-02 05:19:05.000000000 -0500
@@ -227,8 +227,10 @@ acpi_status asmlinkage acpi_enter_sleep_
 	struct acpi_bit_register_info *sleep_type_reg_info;
 	struct acpi_bit_register_info *sleep_enable_reg_info;
 	u32 in_value;
+#ifdef	ACPI_20_GTS_BFS
 	struct acpi_object_list arg_list;
 	union acpi_object arg;
+#endif
 	acpi_status status;
 
 	ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
@@ -467,8 +469,10 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat
  ******************************************************************************/
 acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
 {
+#ifdef	ACPI_20_GTS_BFS
 	struct acpi_object_list arg_list;
 	union acpi_object arg;
+#endif
 	acpi_status status;
 	struct acpi_bit_register_info *sleep_type_reg_info;
 	struct acpi_bit_register_info *sleep_enable_reg_info;

Attachment: pgp00000.pgp
Description: PGP signature