path: root/drivers
diff options
authorLinus Torvalds <>2020-05-17 16:07:30 -0700
committerLinus Torvalds <>2020-05-17 16:07:30 -0700
commit8feea6233d2bf8e43ea99e78d8637ed0745d2732 (patch)
tree27a36fe8a5e4d435f1ab868000269d5b74d80bf5 /drivers
parent9b1f2cbdb6d3062c468d3f9b579501f0f7ce330b (diff)
parent653d374771601a345296dd2904a10e6e479ad866 (diff)
Merge tag 'for-linus-5.7-2' of git://
Pull IPMI update from Corey Minyard: "Convert i2c_new_device() to i2c_new_client_device() Wolfram Sang has asked to have this included in 5.7 so the deprecated API can be removed next release. There should be no functional difference. I think that entire this section of code can be removed; it is leftover from other things that have since changed, but this is the safer thing to do for now. The full removal can happen next release" * tag 'for-linus-5.7-2' of git:// char: ipmi: convert to use i2c_new_client_device()
Diffstat (limited to 'drivers')
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index b7145f370d3b..2704470e021d 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1947,8 +1947,8 @@ static int ssif_adapter_handler(struct device *adev, void *opaque)
if (adev->type != &i2c_adapter_type)
return 0;
- addr_info->added_client = i2c_new_device(to_i2c_adapter(adev),
- &addr_info->binfo);
+ addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev),
+ &addr_info->binfo);
if (!addr_info->adapter_name)
return 1; /* Only try the first I2C adapter by default. */