Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 754d4531 authored by Matthew Garrett's avatar Matthew Garrett Committed by Linus Torvalds
Browse files

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: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8cc5267

drivers/char/ipmi/ipmi_si_intf.c

+12 −11
Original line number Diff line number Diff line
@@ -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