]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
char: ipmi: eliminate misleading print info when being probed via ACPI
authorHanjun Guo <hanjun.guo@linaro.org>
Tue, 4 Jul 2017 04:08:09 +0000 (12:08 +0800)
committerCorey Minyard <cminyard@mvista.com>
Wed, 27 Sep 2017 21:03:45 +0000 (16:03 -0500)
When ipmi is probed via ACPI, the boot log shows

[   17.945139] ipmi_si IPI0001:00: probing via device tree
[   17.950369] ipmi_si IPI0001:00: ipmi_si: probing via ACPI
[   17.955795] ipmi_si IPI0001:00: [io  0x00e4-0x3fff] regsize 1 spacing 1 irq 0
[   17.962932] ipmi_si: Adding ACPI-specified bt state machine

which "ipmi_si IPI0001:00: probing via device tree" is misleading
with a ACPI HID "IPI0001" but probing via DT.

Eliminate this misleading print info by checking of_node is valid
or not before calling of_ipmi_probe().

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
drivers/char/ipmi/ipmi_si_intf.c

index 36f47e8d06a3b90918a5ecb8433a04122bb0c0e8..ecd3844917a545bd06681aea4df9294489a4bf4a 100644 (file)
@@ -2784,7 +2784,7 @@ static int acpi_ipmi_probe(struct platform_device *dev)
 
 static int ipmi_probe(struct platform_device *dev)
 {
-       if (of_ipmi_probe(dev) == 0)
+       if (dev->dev.of_node && of_ipmi_probe(dev) == 0)
                return 0;
 
        if (acpi_ipmi_probe(dev) == 0)