diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 13:26:08 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2019-09-03 15:47:17 -0400 |
commit | 8f9508ebbf769268da76dcd47f210ba5218dbcd2 (patch) | |
tree | f5f468ae1e1fe132a76f9ecf0a36df2bcebd0da7 | |
parent | 12163cfbfc0f804cc7d27bc20e8d266ce7459260 (diff) |
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>
-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) | |||
706 | goto ERROR_SC_2; | 706 | goto ERROR_SC_2; |
707 | } | 707 | } |
708 | 708 | ||
709 | data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); | 709 | data->lm75[0] = i2c_new_dummy_device(adapter, sc_addr[0]); |
710 | if (!data->lm75[0]) { | 710 | if (IS_ERR(data->lm75[0])) { |
711 | dev_err(&client->dev, | 711 | dev_err(&client->dev, |
712 | "subclient %d registration at address 0x%x failed.\n", | 712 | "subclient %d registration at address 0x%x failed.\n", |
713 | 1, sc_addr[0]); | 713 | 1, sc_addr[0]); |
714 | err = -ENOMEM; | 714 | err = PTR_ERR(data->lm75[0]); |
715 | goto ERROR_SC_2; | 715 | goto ERROR_SC_2; |
716 | } | 716 | } |
717 | 717 | ||
718 | data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); | 718 | data->lm75[1] = i2c_new_dummy_device(adapter, sc_addr[1]); |
719 | if (!data->lm75[1]) { | 719 | if (IS_ERR(data->lm75[1])) { |
720 | dev_err(&client->dev, | 720 | dev_err(&client->dev, |
721 | "subclient %d registration at address 0x%x failed.\n", | 721 | "subclient %d registration at address 0x%x failed.\n", |
722 | 2, sc_addr[1]); | 722 | 2, sc_addr[1]); |
723 | err = -ENOMEM; | 723 | err = PTR_ERR(data->lm75[1]); |
724 | goto ERROR_SC_3; | 724 | goto ERROR_SC_3; |
725 | } | 725 | } |
726 | 726 | ||