diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 15:54:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 15:54:57 -0700 |
| commit | 6fa09d313921cd960ebb7f87132e49deb034b5f1 (patch) | |
| tree | 73837f05307412a1d377412b8fd8b1e1f93dafb2 /drivers/char/ipmi/ipmi_plat_data.c | |
| parent | 0080665fbd0e6a771aee366bb2aa208626e43def (diff) | |
| parent | 07cbd87b0416d7b6b8419b2a56bc63659de5d066 (diff) | |
| download | linux-6fa09d313921cd960ebb7f87132e49deb034b5f1.tar.gz linux-6fa09d313921cd960ebb7f87132e49deb034b5f1.tar.bz2 linux-6fa09d313921cd960ebb7f87132e49deb034b5f1.zip | |
Merge tag 'for-linus-5.13-1' of git://github.com/cminyard/linux-ipmi
Pull IPMI updates from Corey Minyard:
"A bunch of little cleanups
Nothing major, no functional changes"
* tag 'for-linus-5.13-1' of git://github.com/cminyard/linux-ipmi:
ipmi_si: Join string literals back
ipmi_si: Drop redundant check before calling put_device()
ipmi_si: Use strstrip() to remove surrounding spaces
ipmi_si: Get rid of ->addr_source_cleanup()
ipmi_si: Reuse si_to_str[] array in ipmi_hardcode_init_one()
ipmi_si: Introduce ipmi_panic_event_str[] array
ipmi_si: Use proper ACPI macros to check error code for failures
ipmi_si: Utilize temporary variable to hold device pointer
ipmi_si: Remove bogus err_free label
ipmi_si: Switch to use platform_get_mem_or_io()
ipmi: Handle device properties with software node API
ipmi:ssif: make ssif_i2c_send() void
ipmi: Refine retry conditions for getting device id
Diffstat (limited to 'drivers/char/ipmi/ipmi_plat_data.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_plat_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_plat_data.c b/drivers/char/ipmi/ipmi_plat_data.c index 28471ff2a3a3..747b51ae01a8 100644 --- a/drivers/char/ipmi/ipmi_plat_data.c +++ b/drivers/char/ipmi/ipmi_plat_data.c @@ -102,7 +102,7 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, goto err; } add_properties: - rv = platform_device_add_properties(pdev, pr); + rv = device_create_managed_software_node(&pdev->dev, pr, NULL); if (rv) { dev_err(&pdev->dev, "Unable to add hard-code properties: %d\n", rv); |