diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2017-07-04 06:08:09 +0200 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-09-27 23:03:45 +0200 |
| commit | 719c1b3810898c3d1837df3d7814a44190fff2c7 (patch) | |
| tree | d0822ae6cd4abd2a5e7b1a61cdf6f89b52aefe95 | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
| download | linux-719c1b3810898c3d1837df3d7814a44190fff2c7.tar.xz linux-719c1b3810898c3d1837df3d7814a44190fff2c7.zip | |
char: ipmi: eliminate misleading print info when being probed via ACPI
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>
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 36f47e8d06a3..ecd3844917a5 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -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) |