ipmi: do not probe ACPI devices if si_tryacpi is unset

Joe Lawrence · cminyard · commit 9f0257b39c13 · 2016-03-18T07:01:24.000-05:00
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 &lt;joe.lawrence@stratus.com&gt;
Signed-off-by: Corey Minyard &lt;cminyard@mvista.com&gt;
diff --git 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;
