OSDN Git Service

media: dvb-frontends: mn88472: convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:25:57 +0000 (14:25 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 13 Aug 2019 14:44:30 +0000 (11:44 -0300)
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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/dvb-frontends/mn88472.c

index 731b44b..ef8094a 100644 (file)
@@ -612,9 +612,9 @@ static int mn88472_probe(struct i2c_client *client,
         * Also, register bank 2 do not support sequential I/O. Only single
         * register write or read is allowed to that bank.
         */
-       dev->client[1] = i2c_new_dummy(client->adapter, 0x1a);
-       if (!dev->client[1]) {
-               ret = -ENODEV;
+       dev->client[1] = i2c_new_dummy_device(client->adapter, 0x1a);
+       if (IS_ERR(dev->client[1])) {
+               ret = PTR_ERR(dev->client[1]);
                dev_err(&client->dev, "I2C registration failed\n");
                if (ret)
                        goto err_regmap_0_regmap_exit;
@@ -626,9 +626,9 @@ static int mn88472_probe(struct i2c_client *client,
        }
        i2c_set_clientdata(dev->client[1], dev);
 
-       dev->client[2] = i2c_new_dummy(client->adapter, 0x1c);
-       if (!dev->client[2]) {
-               ret = -ENODEV;
+       dev->client[2] = i2c_new_dummy_device(client->adapter, 0x1c);
+       if (IS_ERR(dev->client[2])) {
+               ret = PTR_ERR(dev->client[2]);
                dev_err(&client->dev, "2nd I2C registration failed\n");
                if (ret)
                        goto err_regmap_1_regmap_exit;