]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtc: s5m: convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:18 +0000 (19:26 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 23 Jul 2019 18:34:31 +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-5-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-s5m.c

index c7f1bf823ea094e6d352c4e4926fa1ad106cdff0..eb9dde4095a99b811160159534d3429f0c48291b 100644 (file)
@@ -760,10 +760,10 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       info->i2c = i2c_new_dummy(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
-       if (!info->i2c) {
+       info->i2c = i2c_new_dummy_device(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
+       if (IS_ERR(info->i2c)) {
                dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
-               return -ENODEV;
+               return PTR_ERR(info->i2c);
        }
 
        info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);