Prev: [PATCH 8/8] ipmi: Change timeout and event poll to one second
Next: [PATCH 6/8] ipmi: Reduce polling
From: Corey Minyard on 3 May 2010 09:40
From: Matthew Garrett <mjg(a)redhat.com>

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(a)redhat.com>
Signed-off-by: Corey Minyard <cminyard(a)mvista.com>
---

Index: linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6/drivers/char/ipmi/ipmi_si_intf.c
@@ -3308,17 +3308,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)
@@ -3327,6 +3316,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 8/8] ipmi: Change timeout and event poll to one second
Next: [PATCH 6/8] ipmi: Reduce polling