ipmi: do not probe ACPI devices if si_tryacpi is unset

Extend the tryacpi module parameter to turn off acpi_ipmi_probe such
that hard-coded options (type, ports, address, etc.) have complete
control over the smi_info data structures setup by the driver.

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 8671236013f800d67e2d0375940b4f26818ba82c..1e25b5205724deb703fab9b48df8ecdebd41bfb3 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2690,6 +2690,9 @@ static int acpi_ipmi_probe(struct platform_device *dev)
        unsigned long long tmp;
        int rv = -EINVAL;
 
+       if (!si_tryacpi)
+              return 0;
+
        handle = ACPI_HANDLE(&dev->dev);
        if (!handle)
                return -ENODEV;