summaryrefslogtreecommitdiff
path: root/drivers/mfd/da9150-core.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-07-22 19:26:12 +0200
committerLee Jones <lee.jones@linaro.org>2019-08-12 08:52:03 +0100
commite310ee86f9efb92104ac84c178fd11bdf83216eb (patch)
treefa8d80a9076d35cb960ed0d03b24ca6e826608ba /drivers/mfd/da9150-core.c
parent98f0c05f409e4fbf186b11dcb2baed84a253c224 (diff)
downloadlwn-e310ee86f9efb92104ac84c178fd11bdf83216eb.tar.gz
lwn-e310ee86f9efb92104ac84c178fd11bdf83216eb.zip
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: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/da9150-core.c')
-rw-r--r--drivers/mfd/da9150-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 13033068721a..7f0aa1e8db96 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -420,10 +420,10 @@ static int da9150_probe(struct i2c_client *client,
qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
- da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
- if (!da9150->core_qif) {
+ da9150->core_qif = i2c_new_dummy_device(client->adapter, qif_addr);
+ if (IS_ERR(da9150->core_qif)) {
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);