| Message ID | 20190722172613.3890-3-wsa+renesas@sang-engineering.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | iio: convert subsystem to i2c_new_dummy_device() | expand |
On Mon, 22 Jul 2019 19:26:12 +0200 Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > 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> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to do something random with it. Thanks, Jonathan > --- > > Generated with coccinelle. Build tested by me and buildbot. Not tested on HW. > > drivers/iio/light/veml6070.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/light/veml6070.c b/drivers/iio/light/veml6070.c > index a3138e1b5803..0be553ad5989 100644 > --- a/drivers/iio/light/veml6070.c > +++ b/drivers/iio/light/veml6070.c > @@ -158,10 +158,10 @@ static int veml6070_probe(struct i2c_client *client, > indio_dev->name = VEML6070_DRV_NAME; > indio_dev->modes = INDIO_DIRECT_MODE; > > - data->client2 = i2c_new_dummy(client->adapter, VEML6070_ADDR_DATA_LSB); > - if (!data->client2) { > + data->client2 = i2c_new_dummy_device(client->adapter, VEML6070_ADDR_DATA_LSB); > + if (IS_ERR(data->client2)) { > dev_err(&client->dev, "i2c device for second chip address failed\n"); > - return -ENODEV; > + return PTR_ERR(data->client2); > } > > data->config = VEML6070_IT_10 | VEML6070_COMMAND_RSRVD |
diff --git a/drivers/iio/light/veml6070.c b/drivers/iio/light/veml6070.c index a3138e1b5803..0be553ad5989 100644 --- a/drivers/iio/light/veml6070.c +++ b/drivers/iio/light/veml6070.c @@ -158,10 +158,10 @@ static int veml6070_probe(struct i2c_client *client, indio_dev->name = VEML6070_DRV_NAME; indio_dev->modes = INDIO_DIRECT_MODE; - data->client2 = i2c_new_dummy(client->adapter, VEML6070_ADDR_DATA_LSB); - if (!data->client2) { + data->client2 = i2c_new_dummy_device(client->adapter, VEML6070_ADDR_DATA_LSB); + if (IS_ERR(data->client2)) { dev_err(&client->dev, "i2c device for second chip address failed\n"); - return -ENODEV; + return PTR_ERR(data->client2); } data->config = VEML6070_IT_10 | VEML6070_COMMAND_RSRVD |
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> --- Generated with coccinelle. Build tested by me and buildbot. Not tested on HW. drivers/iio/light/veml6070.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)