OSDN Git Service

mfd: palmas: Convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:20 +0000 (19:26 +0200)
committerLee Jones <lee.jones@linaro.org>
Mon, 12 Aug 2019 07:54:16 +0000 (08:54 +0100)
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>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/palmas.c

index 6818ff3..f5b3fa9 100644 (file)
@@ -549,12 +549,12 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
                        palmas->i2c_clients[i] = i2c;
                else {
                        palmas->i2c_clients[i] =
-                                       i2c_new_dummy(i2c->adapter,
+                                       i2c_new_dummy_device(i2c->adapter,
                                                        i2c->addr + i);
-                       if (!palmas->i2c_clients[i]) {
+                       if (IS_ERR(palmas->i2c_clients[i])) {
                                dev_err(palmas->dev,
                                        "can't attach client %d\n", i);
-                               ret = -ENOMEM;
+                               ret = PTR_ERR(palmas->i2c_clients[i]);
                                goto err_i2c;
                        }
                        palmas->i2c_clients[i]->dev.of_node = of_node_get(node);