forked from Minki/linux
platform/mellanox: mlxreg-hotplug: convert to use i2c_new_client_device()
Move away from the deprecated API and return the shiny new ERRPTR where useful. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
e14d796d83
commit
84c0eb212c
@ -101,6 +101,7 @@ static int mlxreg_hotplug_device_create(struct mlxreg_hotplug_priv_data *priv,
|
||||
struct mlxreg_core_data *data)
|
||||
{
|
||||
struct mlxreg_core_hotplug_platform_data *pdata;
|
||||
struct i2c_client *client;
|
||||
|
||||
/* Notify user by sending hwmon uevent. */
|
||||
kobject_uevent(&priv->hwmon->kobj, KOBJ_CHANGE);
|
||||
@ -121,18 +122,20 @@ static int mlxreg_hotplug_device_create(struct mlxreg_hotplug_priv_data *priv,
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
data->hpdev.client = i2c_new_device(data->hpdev.adapter,
|
||||
data->hpdev.brdinfo);
|
||||
if (!data->hpdev.client) {
|
||||
client = i2c_new_client_device(data->hpdev.adapter,
|
||||
data->hpdev.brdinfo);
|
||||
if (IS_ERR(client)) {
|
||||
dev_err(priv->dev, "Failed to create client %s at bus %d at addr 0x%02x\n",
|
||||
data->hpdev.brdinfo->type, data->hpdev.nr +
|
||||
pdata->shift_nr, data->hpdev.brdinfo->addr);
|
||||
|
||||
i2c_put_adapter(data->hpdev.adapter);
|
||||
data->hpdev.adapter = NULL;
|
||||
return -EFAULT;
|
||||
return PTR_ERR(client);
|
||||
}
|
||||
|
||||
data->hpdev.client = client;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user