diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 19:26:14 +0200 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2019-08-12 08:53:58 +0100 |
commit | ad28edcb87337a1c9e52cae4694eb419883b16a9 (patch) | |
tree | 086394dd0b2c94546db00c877fa30f1fb00b36f4 /drivers/mfd/max77693.c | |
parent | f6ae8129631f6a3e072ec8d3ab60a65aa825f5f0 (diff) | |
download | linux-stable-ad28edcb87337a1c9e52cae4694eb419883b16a9.tar.gz linux-stable-ad28edcb87337a1c9e52cae4694eb419883b16a9.tar.bz2 linux-stable-ad28edcb87337a1c9e52cae4694eb419883b16a9.zip |
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>
Diffstat (limited to 'drivers/mfd/max77693.c')
-rw-r--r-- | drivers/mfd/max77693.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c index 901d99d65924..596ed85cab3b 100644 --- a/drivers/mfd/max77693.c +++ b/drivers/mfd/max77693.c @@ -183,17 +183,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c, } else dev_info(max77693->dev, "device ID: 0x%x\n", reg_data); - max77693->i2c_muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC); - if (!max77693->i2c_muic) { + max77693->i2c_muic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_MUIC); + if (IS_ERR(max77693->i2c_muic)) { 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); - max77693->i2c_haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC); - if (!max77693->i2c_haptic) { + max77693->i2c_haptic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_HAPTIC); + if (IS_ERR(max77693->i2c_haptic)) { dev_err(max77693->dev, "Failed to allocate I2C device for Haptic\n"); - ret = -ENODEV; + ret = PTR_ERR(max77693->i2c_haptic); goto err_i2c_haptic; } i2c_set_clientdata(max77693->i2c_haptic, max77693); |