iio: light: cm36651: convert to i2c_new_dummy_device
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 22 Jul 2019 17:26:11 +0000 (19:26 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 27 Jul 2019 21:52:07 +0000 (22:52 +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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/light/cm36651.c

index 7702c2bcbcfa7b96f245a2a38fbc8cc65629c636..1019d625adb1e355a837e6313af81ac14ab4b769 100644 (file)
@@ -646,18 +646,18 @@ static int cm36651_probe(struct i2c_client *client,
        i2c_set_clientdata(client, indio_dev);
 
        cm36651->client = client;
-       cm36651->ps_client = i2c_new_dummy(client->adapter,
+       cm36651->ps_client = i2c_new_dummy_device(client->adapter,
                                                     CM36651_I2C_ADDR_PS);
-       if (!cm36651->ps_client) {
+       if (IS_ERR(cm36651->ps_client)) {
                dev_err(&client->dev, "%s: new i2c device failed\n", __func__);
-               ret = -ENODEV;
+               ret = PTR_ERR(cm36651->ps_client);
                goto error_disable_reg;
        }
 
-       cm36651->ara_client = i2c_new_dummy(client->adapter, CM36651_ARA);
-       if (!cm36651->ara_client) {
+       cm36651->ara_client = i2c_new_dummy_device(client->adapter, CM36651_ARA);
+       if (IS_ERR(cm36651->ara_client)) {
                dev_err(&client->dev, "%s: new i2c device failed\n", __func__);
-               ret = -ENODEV;
+               ret = PTR_ERR(cm36651->ara_client);
                goto error_i2c_unregister_ps;
        }