Commit e310ee86 authored by Wolfram Sang's avatar Wolfram Sang Committed by Lee Jones

mfd: da9150-core: 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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 98f0c05f
...@@ -420,10 +420,10 @@ static int da9150_probe(struct i2c_client *client, ...@@ -420,10 +420,10 @@ static int da9150_probe(struct i2c_client *client,
qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A); qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1; qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
qif_addr |= DA9150_QIF_I2C_ADDR_LSB; qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr); da9150->core_qif = i2c_new_dummy_device(client->adapter, qif_addr);
if (!da9150->core_qif) { if (IS_ERR(da9150->core_qif)) {
dev_err(da9150->dev, "Failed to attach QIF client\n"); dev_err(da9150->dev, "Failed to attach QIF client\n");
return -ENODEV; return PTR_ERR(da9150->core_qif);
} }
i2c_set_clientdata(da9150->core_qif, da9150); i2c_set_clientdata(da9150->core_qif, da9150);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment