misc: eeprom: ee1004: 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 <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20190722172616.3982-2-wsa+renesas@sang-engineering.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/eeprom/ee1004.c b/drivers/misc/eeprom/ee1004.c
index 6f00c33..b081c67 100644 (file)
--- a/drivers/misc/eeprom/ee1004.c
+++ b/drivers/misc/eeprom/ee1004.c
@@ -195,13 +195,13 @@ static int ee1004_probe(struct i2c_client *client,
        mutex_lock(&ee1004_bus_lock);
        if (++ee1004_dev_count == 1) {
                for (cnr = 0; cnr < 2; cnr++) {
-                       ee1004_set_page[cnr] = i2c_new_dummy(client->adapter,
+                       ee1004_set_page[cnr] = i2c_new_dummy_device(client->adapter,
                                                EE1004_ADDR_SET_PAGE + cnr);
-                       if (!ee1004_set_page[cnr]) {
+                       if (IS_ERR(ee1004_set_page[cnr])) {
                                dev_err(&client->dev,
                                        "address 0x%02x unavailable\n",
                                        EE1004_ADDR_SET_PAGE + cnr);
-                               err = -EADDRINUSE;
+                               err = PTR_ERR(ee1004_set_page[cnr]);
                                goto err_clients;
                        }
                }