Merge branches 'acpi-misc' and 'acpi-video'

* acpi-misc:
  ACPI: fix false-positive -Wuninitialized warning
  ACPI: blacklist: fix clang warning for unused DMI table

* acpi-video:
  ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 587aeeeb5070a1dea1bed495e0735af4f8818b1f..46a8baf28bd0f3ae268cef25cf1ea9dcc00e99c2 100644 (file)
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -174,12 +174,11 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
                return_ACPI_STATUS(status);
        }
 
-       /* Complete the initialization/resolution of package objects */
+       /* Complete the initialization/resolution of new objects */
 
-       status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
-                                       ACPI_UINT32_MAX, 0,
-                                       acpi_ns_init_one_package, NULL, NULL,
-                                       NULL);
+       acpi_ex_exit_interpreter();
+       acpi_ns_initialize_objects();
+       acpi_ex_enter_interpreter();
 
        /* Parameter Data (optional) */
 
@@ -437,12 +436,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(status);
        }
 
-       /* Complete the initialization/resolution of package objects */
+       /* Complete the initialization/resolution of new objects */
 
-       status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT,
-                                       ACPI_UINT32_MAX, 0,
-                                       acpi_ns_init_one_package, NULL, NULL,
-                                       NULL);
+       acpi_ex_exit_interpreter();
+       acpi_ns_initialize_objects();
+       acpi_ex_enter_interpreter();
 
        /* Store the ddb_handle into the Target operand */
 

diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index ef8f8a9f3c9c598251db7ce59985c316dfefce7f..86f1693f6d29a8f5ae36d8abf84d288059994c9f 100644 (file)
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -297,15 +297,11 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
        status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
                                                ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
                                                FALSE, &table_index);
-
        if (ACPI_SUCCESS(status)) {
-               /* Complete the initialization/resolution of package objects */
 
-               status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,
-                                               ACPI_ROOT_OBJECT,
-                                               ACPI_UINT32_MAX, 0,
-                                               acpi_ns_init_one_package,
-                                               NULL, NULL, NULL);
+               /* Complete the initialization/resolution of new objects */
+
+               acpi_ns_initialize_objects();
        }
 
        return_ACPI_STATUS(status);

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index ad2c565f5cbe0686e86d51349689ef0f259b2417..a86a770c9b798a9412465e7e8a9de4ce0d085831 100644 (file)
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -17,7 +17,9 @@
 
 #include "internal.h"
 
+#ifdef CONFIG_DMI
 static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;
+#endif
 
 /*
  * POLICY: If *anything* doesn't work, put it on the blacklist.
@@ -61,7 +63,9 @@ int __init acpi_blacklisted(void)
        }
 
        (void)early_acpi_osi_init();
+#ifdef CONFIG_DMI
        dmi_check_system(acpi_rev_dmi_table);
+#endif
 
        return blacklisted;
 }

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 451e7b544342b24a6e1d22a6b51fbeb2b706c36b..8309923eafe1907bf79b0fb855f7aaf2934aae08 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -324,7 +324,10 @@ struct irq_domain *acpi_irq_create_hierarchy(unsigned int flags,
 #ifdef CONFIG_X86_IO_APIC
 extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity);
 #else
-#define acpi_get_override_irq(gsi, trigger, polarity) (-1)
+static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
+{
+       return -1;
+}
 #endif
 /*
  * This function undoes the effect of one call to acpi_register_gsi().