rtc: max77686: convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:16 +0000 (19:26 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 23 Jul 2019 18:34:15 +0000 (20:34 +0200)
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>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20190722172618.4061-3-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-max77686.c

index 4aff349ae301a476ab579b753fa388f83b4a45fd..3d924c34fd73fb5b1b1af86151734b974bb4889c 100644 (file)
@@ -693,11 +693,11 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info)
                goto add_rtc_irq;
        }
 
-       info->rtc = i2c_new_dummy(parent_i2c->adapter,
-                                 info->drv_data->rtc_i2c_addr);
-       if (!info->rtc) {
+       info->rtc = i2c_new_dummy_device(parent_i2c->adapter,
+                                        info->drv_data->rtc_i2c_addr);
+       if (IS_ERR(info->rtc)) {
                dev_err(info->dev, "Failed to allocate I2C device for RTC\n");
-               return -ENODEV;
+               return PTR_ERR(info->rtc);
        }
 
        info->rtc_regmap = devm_regmap_init_i2c(info->rtc,