summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-07-22 19:26:19 +0200
committerLee Jones <lee.jones@linaro.org>2019-08-12 08:53:58 +0100
commit7a99c8f3310b13c87ec87114e6fa3e915005b187 (patch)
tree6fb08e3d0f9a9b917521cbd9a4172966cfa94f6d /drivers/mfd
parent4e32bff681fb4a7eb552af7187735a68c5afeab1 (diff)
downloadlinux-7a99c8f3310b13c87ec87114e6fa3e915005b187.tar.gz
linux-7a99c8f3310b13c87ec87114e6fa3e915005b187.tar.bz2
linux-7a99c8f3310b13c87ec87114e6fa3e915005b187.zip
mfd: max8998: 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')
-rw-r--r--drivers/mfd/max8998.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 56409df120f8..785f8e9841b7 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -195,10 +195,10 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
}
mutex_init(&max8998->iolock);
- max8998->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
- if (!max8998->rtc) {
+ max8998->rtc = i2c_new_dummy_device(i2c->adapter, RTC_I2C_ADDR);
+ if (IS_ERR(max8998->rtc)) {
dev_err(&i2c->dev, "Failed to allocate I2C device for RTC\n");
- return -ENODEV;
+ return PTR_ERR(max8998->rtc);
}
i2c_set_clientdata(max8998->rtc, max8998);