Message ID | 20190722172618.4061-3-wsa+renesas@sang-engineering.com |
---|---|
State | Awaiting Upstream |
Headers | show |
Series | rtc: convert subsystem to i2c_new_dummy_device() | expand |
On Mon, 22 Jul 2019 at 19:26, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > 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> > --- > > Generated with coccinelle. Build tested by me and buildbot. Not tested on HW. > > drivers/rtc/rtc-max77686.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Tested-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c index 4aff349ae301..d04fd1024697 100644 --- a/drivers/rtc/rtc-max77686.c +++ b/drivers/rtc/rtc-max77686.c @@ -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->rtc = i2c_new_dummy_device(parent_i2c->adapter, info->drv_data->rtc_i2c_addr); - if (!info->rtc) { + 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,
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> --- Generated with coccinelle. Build tested by me and buildbot. Not tested on HW. drivers/rtc/rtc-max77686.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)