| Message ID | 20190722172611.3797-4-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: convert subsystem to i2c_new_dummy_device() | expand |
On Mon, Jul 22, 2019 at 07:26:10PM +0200, Wolfram Sang 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 hwmon-next. Thanks, Guenter > --- > > Generated with coccinelle. Build tested by me and buildbot. Not tested on HW. > > drivers/hwmon/w83781d.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c > index d2c04b6a3f2b..015f1ea31966 100644 > --- a/drivers/hwmon/w83781d.c > +++ b/drivers/hwmon/w83781d.c > @@ -894,12 +894,12 @@ w83781d_detect_subclients(struct i2c_client *new_client) > } > > for (i = 0; i < num_sc; i++) { > - data->lm75[i] = i2c_new_dummy(adapter, sc_addr[i]); > - if (!data->lm75[i]) { > + data->lm75[i] = i2c_new_dummy_device(adapter, sc_addr[i]); > + if (IS_ERR(data->lm75[i])) { > dev_err(&new_client->dev, > "Subclient %d registration at address 0x%x failed.\n", > i, sc_addr[i]); > - err = -ENOMEM; > + err = PTR_ERR(data->lm75[i]); > if (i == 1) > goto ERROR_SC_3; > goto ERROR_SC_2;
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index d2c04b6a3f2b..015f1ea31966 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c @@ -894,12 +894,12 @@ w83781d_detect_subclients(struct i2c_client *new_client) } for (i = 0; i < num_sc; i++) { - data->lm75[i] = i2c_new_dummy(adapter, sc_addr[i]); - if (!data->lm75[i]) { + data->lm75[i] = i2c_new_dummy_device(adapter, sc_addr[i]); + if (IS_ERR(data->lm75[i])) { dev_err(&new_client->dev, "Subclient %d registration at address 0x%x failed.\n", i, sc_addr[i]); - err = -ENOMEM; + err = PTR_ERR(data->lm75[i]); if (i == 1) goto ERROR_SC_3; goto ERROR_SC_2;
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/hwmon/w83781d.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)