aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-10 21:28:03 -0500
committerLen Brown <len.brown@intel.com>2007-02-13 02:58:52 -0500
commit7f8f97c3cc75d5783d0b45cf323dedf17684be19 (patch)
tree347a8b2e06904598fea849c533a866727addaf5e /arch
parent7cda93e008e1a477970adbf82dba81a5d4f0ae40 (diff)
ACPI: acpi_table_parse() now returns success/fail, not count
Returning count for tables that are supposed to be unique was useless and confusing. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/acpi/boot.c5
-rw-r--r--arch/x86_64/kernel/early-quirks.c4
-rw-r--r--arch/x86_64/pci/mmconfig.c4
3 files changed, 8 insertions, 5 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)
865static void __init acpi_process_madt(void) 865static void __init acpi_process_madt(void)
866{ 866{
867#ifdef CONFIG_X86_LOCAL_APIC 867#ifdef CONFIG_X86_LOCAL_APIC
868 int count, error; 868 int error;
869 869
870 count = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt); 870 if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
871 if (count >= 1) {
872 871
873 /* 872 /*
874 * Parse MADT LAPIC entries 873 * 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)
53 return; 53 return;
54 54
55 nvidia_hpet_detected = 0; 55 nvidia_hpet_detected = 0;
56 acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check); 56 if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
57 return;
58
57 if (nvidia_hpet_detected == 0) { 59 if (nvidia_hpet_detected == 0) {
58 acpi_skip_timer_override = 1; 60 acpi_skip_timer_override = 1;
59 printk(KERN_INFO "Nvidia board " 61 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)
170 if ((pci_probe & PCI_PROBE_MMCONF) == 0) 170 if ((pci_probe & PCI_PROBE_MMCONF) == 0)
171 return; 171 return;
172 172
173 acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg); 173 if (acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg))
174 return;
175
174 if ((pci_mmcfg_config_num == 0) || 176 if ((pci_mmcfg_config_num == 0) ||
175 (pci_mmcfg_config == NULL) || 177 (pci_mmcfg_config == NULL) ||
176 (pci_mmcfg_config[0].address == 0)) 178 (pci_mmcfg_config[0].address == 0))