diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 10:34:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 10:34:17 -0700 |
| commit | 85c1a25494837ff33fdfebe98b2e4cf5b0c78475 (patch) | |
| tree | 5d3953f955b8b3dbc17724e097bf711da6e68781 /drivers/char/ipmi/ipmi_si_platform.c | |
| parent | Merge tag 'pinctrl-v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| parent | ipmi: Remove warning if no slave address is present (diff) | |
| download | linux-dev-85c1a25494837ff33fdfebe98b2e4cf5b0c78475.tar.xz linux-dev-85c1a25494837ff33fdfebe98b2e4cf5b0c78475.zip | |
Merge tag 'for-linus-5.2' of git://github.com/cminyard/linux-ipmi
Pull IPMI updates from Corey Minyard:
"Some minor cleanups for the IPMI driver"
* tag 'for-linus-5.2' of git://github.com/cminyard/linux-ipmi:
ipmi: Remove warning if no slave address is present
ipmi:ssif: Only unregister the platform driver if it was registered
ipmi:ssif: compare block number correctly for multi-part return messages
ipmi: Add the i2c-addr property for SSIF interfaces
char/ipmi: fix spelling mistake "receieved_messages" -> "received_messages"
ipmi: avoid atomic_inc in exit function
ipmi: Remove file from ipmi_file_private
ipmi_si: remove an unused variable in try_smi_init()
ipmi: Make ipmi_interfaces_srcu variable static
Diffstat (limited to 'drivers/char/ipmi/ipmi_si_platform.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_platform.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c index 54c7ded2a1ff..f2a91c4d8cab 100644 --- a/drivers/char/ipmi/ipmi_si_platform.c +++ b/drivers/char/ipmi/ipmi_si_platform.c @@ -188,12 +188,10 @@ static int platform_ipmi_probe(struct platform_device *pdev) return -EINVAL; rv = device_property_read_u8(&pdev->dev, "slave-addr", &slave_addr); - if (rv) { - dev_warn(&pdev->dev, "device has no slave-addr property\n"); + if (rv) io.slave_addr = 0x20; - } else { + else io.slave_addr = slave_addr; - } io.irq = platform_get_irq(pdev, 0); if (io.irq > 0) |