On Monday 28 December 2009 06:44:19 pm yakui.zhao@xxxxxxxxx wrote: > From: Zhao Yakui <yakui.zhao@xxxxxxxxx> > > Sometimes one IPMI system interface will be detected by several methods. > For example: ACPI mechanism, SPMI table, DMI or hardcode mechanism. > In such case when one IPMI system interface can be detected in two mechanism, > the second mechanism will fail in the detection and can't record which IPMI > system interface is detected by it. > > Use the ACPI detection mechanism firstly to detect the IPMI system interface > so that we can know which IPMI system interface is detected in ACPI namespace. > > Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx> > --- > drivers/char/ipmi/ipmi_si_intf.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c > index 176f175..3f6ca11 100644 > --- a/drivers/char/ipmi/ipmi_si_intf.c > +++ b/drivers/char/ipmi/ipmi_si_intf.c > @@ -3195,6 +3195,10 @@ static __devinit int init_ipmi_si(void) > > printk(KERN_INFO "IPMI System Interface driver.\n"); > > +#ifdef CONFIG_ACPI > + pnp_register_driver(&ipmi_pnp_driver); > +#endif > + > hardcode_find_bmc(); The usual practice is to handle devices explicitly specified by module parameters first. That way, the driver should work with no module parameters in most cases, but the user can specify the device location manually if necessary to work around a firmware bug. For that reason, I would use this order instead: hardcode_find_bmc(); pnp_register_driver(); ... > #ifdef CONFIG_DMI > @@ -3204,9 +3208,6 @@ static __devinit int init_ipmi_si(void) > #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); > @@ -3330,6 +3331,7 @@ static __exit void cleanup_ipmi_si(void) > #ifdef CONFIG_PCI > pci_unregister_driver(&ipmi_pci_driver); > #endif > + > #ifdef CONFIG_ACPI > pnp_unregister_driver(&ipmi_pnp_driver); > #endif -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
