p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mfd: max77693: Convert to i2c_new_dummy_device 

Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Wolfram Sang 2019-07-22 19:26:14 +02:00 committed by Lee Jones
parent f6ae812963
commit ad28edcb87
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/max77693.c
View File

@ -183,17 +183,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
} else } else
dev_info(max77693->dev, "device ID: 0x%x\n", reg_data); dev_info(max77693->dev, "device ID: 0x%x\n", reg_data);
max77693->i2c_muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC); max77693->i2c_muic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_MUIC);
if (!max77693->i2c_muic) { if (IS_ERR(max77693->i2c_muic)) {
dev_err(max77693->dev, "Failed to allocate I2C device for MUIC\n"); dev_err(max77693->dev, "Failed to allocate I2C device for MUIC\n");
return -ENODEV; return PTR_ERR(max77693->i2c_muic);
} }
i2c_set_clientdata(max77693->i2c_muic, max77693); i2c_set_clientdata(max77693->i2c_muic, max77693);
max77693->i2c_haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC); max77693->i2c_haptic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_HAPTIC);
if (!max77693->i2c_haptic) { if (IS_ERR(max77693->i2c_haptic)) {
dev_err(max77693->dev, "Failed to allocate I2C device for Haptic\n"); dev_err(max77693->dev, "Failed to allocate I2C device for Haptic\n");
ret = -ENODEV; ret = PTR_ERR(max77693->i2c_haptic);
goto err_i2c_haptic; goto err_i2c_haptic;
} }
i2c_set_clientdata(max77693->i2c_haptic, max77693); i2c_set_clientdata(max77693->i2c_haptic, max77693);