OSDN Git Service

mfd: max8907: Convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:16 +0000 (19:26 +0200)
committerLee Jones <lee.jones@linaro.org>
Mon, 12 Aug 2019 07:53:58 +0000 (08:53 +0100)
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>
drivers/mfd/max8907.c

index cc01f70..d44baaf 100644 (file)
@@ -214,9 +214,9 @@ static int max8907_i2c_probe(struct i2c_client *i2c,
                goto err_regmap_gen;
        }
 
-       max8907->i2c_rtc = i2c_new_dummy(i2c->adapter, MAX8907_RTC_I2C_ADDR);
-       if (!max8907->i2c_rtc) {
-               ret = -ENOMEM;
+       max8907->i2c_rtc = i2c_new_dummy_device(i2c->adapter, MAX8907_RTC_I2C_ADDR);
+       if (IS_ERR(max8907->i2c_rtc)) {
+               ret = PTR_ERR(max8907->i2c_rtc);
                goto err_dummy_rtc;
        }
        i2c_set_clientdata(max8907->i2c_rtc, max8907);