From: Wolfram Sang Date: Mon, 22 Jul 2019 17:26:17 +0000 (+0200) Subject: rtc: s35390a: convert to i2c_new_dummy_device X-Git-Tag: v5.4-rc1~74^2~45 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca83542cdb5c14dd369de2539bdca2670d89feea;p=users%2Fjedix%2Flinux-maple.git rtc: s35390a: convert to i2c_new_dummy_device 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 Link: https://lore.kernel.org/r/20190722172618.4061-4-wsa+renesas@sang-engineering.com Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c index 84806ff763cf..d773fd597bd5 100644 --- a/drivers/rtc/rtc-s35390a.c +++ b/drivers/rtc/rtc-s35390a.c @@ -450,12 +450,12 @@ static int s35390a_probe(struct i2c_client *client, /* This chip uses multiple addresses, use dummy devices for them */ for (i = 1; i < 8; ++i) { - s35390a->client[i] = i2c_new_dummy(client->adapter, - client->addr + i); - if (!s35390a->client[i]) { + s35390a->client[i] = i2c_new_dummy_device(client->adapter, + client->addr + i); + if (IS_ERR(s35390a->client[i])) { dev_err(dev, "Address %02x unavailable\n", client->addr + i); - err = -EBUSY; + err = PTR_ERR(s35390a->client[i]); goto exit_dummy; } }