OSDN Git Service

mfd: max8998: Convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:19 +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/max8998.c

index 56409df..785f8e9 100644 (file)
@@ -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);