diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 19:26:08 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2019-09-03 21:47:17 +0200 |
| commit | 8f9508ebbf769268da76dcd47f210ba5218dbcd2 (patch) | |
| tree | f5f468ae1e1fe132a76f9ecf0a36df2bcebd0da7 /drivers/hwmon/asb100.c | |
| parent | hwmon: (k10temp) Add support for AMD family 17h, model 70h CPUs (diff) | |
| download | linux-8f9508ebbf769268da76dcd47f210ba5218dbcd2.tar.xz linux-8f9508ebbf769268da76dcd47f210ba5218dbcd2.zip | |
hwmon: (asb100) convert to i2c_new_dummy_device
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>
Link: https://lore.kernel.org/r/20190722172611.3797-2-wsa+renesas@sang-engineering.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/asb100.c')
| -rw-r--r-- | drivers/hwmon/asb100.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index c9fa84b25678..4c609e23a4ef 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c @@ -706,21 +706,21 @@ static int asb100_detect_subclients(struct i2c_client *client) goto ERROR_SC_2; } - data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); - if (!data->lm75[0]) { + data->lm75[0] = i2c_new_dummy_device(adapter, sc_addr[0]); + if (IS_ERR(data->lm75[0])) { dev_err(&client->dev, "subclient %d registration at address 0x%x failed.\n", 1, sc_addr[0]); - err = -ENOMEM; + err = PTR_ERR(data->lm75[0]); goto ERROR_SC_2; } - data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); - if (!data->lm75[1]) { + data->lm75[1] = i2c_new_dummy_device(adapter, sc_addr[1]); + if (IS_ERR(data->lm75[1])) { dev_err(&client->dev, "subclient %d registration at address 0x%x failed.\n", 2, sc_addr[1]); - err = -ENOMEM; + err = PTR_ERR(data->lm75[1]); goto ERROR_SC_3; } |