5 files changed, 21 insertions, 11 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index e94aff6888ca..7ac7b67b8519 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -865,10 +865,9 @@ static inline int acpi_parse_madt_ioapic_entries(void)
 static void __init acpi_process_madt(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
-        int count, error;
+        int error;
 
-        count = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt);
-        if (count >= 1) {
+        if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
 
                 /*
                  * Parse MADT LAPIC entries
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index bd30d138113f..8047ea8c2ab2 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -53,7 +53,9 @@ static void nvidia_bugs(void)
                 return;
 
         nvidia_hpet_detected = 0;
-        acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
+        if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
+                return;
+
         if (nvidia_hpet_detected == 0) {
                 acpi_skip_timer_override = 1;
                 printk(KERN_INFO "Nvidia board "
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index faabb6e87f12..98202cb50d8a 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -170,7 +170,9 @@ void __init pci_mmcfg_init(int type)
         if ((pci_probe & PCI_PROBE_MMCONF) == 0)
                 return;
 
-        acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
+        if (acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg))
+                return;
+
         if ((pci_mmcfg_config_num == 0) ||
             (pci_mmcfg_config == NULL) ||
             (pci_mmcfg_config[0].address == 0))
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index dcd58a446f4b..bb6caab24322 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -220,9 +220,7 @@ int __init acpi_numa_init(void)
         int result;
 
         /* SRAT: Static Resource Affinity Table */
-        result = acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat);
-
-        if (result > 0) {
+        if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
                 result = acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
                                                acpi_parse_processor_affinity,
                                                NR_CPUS);
@@ -230,7 +228,7 @@ int __init acpi_numa_init(void)
         }
 
         /* SLIT: System Locality Information Table */
-        result = acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
+        acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
 
         acpi_numa_arch_fixup();
         return 0;
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index ba4cb200314a..2075ec7b827b 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -226,6 +226,15 @@ acpi_table_parse_madt(enum acpi_madt_type id,
                                             handler, max_entries);
 }
 
+/**
+ * acpi_table_parse - find table with @id, run @handler on it
+ *
+ * @id: table id to find
+ * @handler: handler to run
+ *
+ * Scan the ACPI System Descriptor Table (STD) for a table matching @id,
+ * run @handler on it.  Return 0 if table found, return on if not.
+ */
 int __init acpi_table_parse(char *id, acpi_table_handler handler)
 {
         struct acpi_table_header *table = NULL;
@@ -235,9 +244,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
         acpi_get_table(id, 0, &table);
         if (table) {
                 handler(table);
-                return 1;
-        } else
                 return 0;
+        } else
+                return 1;
 }
 
 /*