ipmi: change device discovery order

The ipmi spec provides an ordering for si discovery.  Change the driver to
match, with the exception of preferring smbios to SPMI as HPs (at least)
contain accurate information in the former but not the latter.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Garrett 2010-05-26 14:43:47 -07:00 committed by Linus Torvalds
parent d8cc5267b8
commit 754d453185

View File

@ -3306,17 +3306,6 @@ static __devinit int init_ipmi_si(void)
}
mutex_unlock(&smi_infos_lock);
#ifdef CONFIG_DMI
dmi_find_bmc();
#endif
#ifdef CONFIG_ACPI
spmi_find_bmc();
#endif
#ifdef CONFIG_ACPI
pnp_register_driver(&ipmi_pnp_driver);
#endif
#ifdef CONFIG_PCI
rv = pci_register_driver(&ipmi_pci_driver);
if (rv)
@ -3325,6 +3314,18 @@ static __devinit int init_ipmi_si(void)
rv);
#endif
#ifdef CONFIG_ACPI
pnp_register_driver(&ipmi_pnp_driver);
#endif
#ifdef CONFIG_DMI
dmi_find_bmc();
#endif
#ifdef CONFIG_ACPI
spmi_find_bmc();
#endif
#ifdef CONFIG_PPC_OF
of_register_platform_driver(&ipmi_of_platform_driver);
#endif