summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max14577.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-07-22 19:26:13 +0200
committerLee Jones <lee.jones@linaro.org>2019-08-12 09:53:58 +0200
commitf6ae8129631f6a3e072ec8d3ab60a65aa825f5f0 (patch)
tree3e281ffb9bd3137f42d4c1591d7c8de185a05537 /drivers/mfd/max14577.c
parentmfd: da9150-core: Convert to i2c_new_dummy_device (diff)
downloadlinux-f6ae8129631f6a3e072ec8d3ab60a65aa825f5f0.tar.xz
linux-f6ae8129631f6a3e072ec8d3ab60a65aa825f5f0.zip
mfd: max14577: 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 '')
-rw-r--r--drivers/mfd/max14577.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index ebb13d5de530..fd8864cafd25 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -297,11 +297,11 @@ static int max77836_init(struct max14577 *max14577)
int ret;
u8 intsrc_mask;
- max14577->i2c_pmic = i2c_new_dummy(max14577->i2c->adapter,
+ max14577->i2c_pmic = i2c_new_dummy_device(max14577->i2c->adapter,
I2C_ADDR_PMIC);
- if (!max14577->i2c_pmic) {
+ if (IS_ERR(max14577->i2c_pmic)) {
dev_err(max14577->dev, "Failed to register PMIC I2C device\n");
- return -ENODEV;
+ return PTR_ERR(max14577->i2c_pmic);
}
i2c_set_clientdata(max14577->i2c_pmic, max14577);