diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 19:26:09 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2019-08-12 09:51:50 +0200 |
| commit | 9520b835ffda85cdc1c84b1946c4dd3b6d00184c (patch) | |
| tree | d55d101b4b1f3f8e9b11378f675b666e2a845732 | |
| parent | mfd: 88pm800: Convert to i2c_new_dummy_device (diff) | |
| download | linux-9520b835ffda85cdc1c84b1946c4dd3b6d00184c.tar.xz linux-9520b835ffda85cdc1c84b1946c4dd3b6d00184c.zip | |
mfd: 88pm860x-core: 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>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/88pm860x-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 9e0bd135730f..c9bae71f643a 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1178,12 +1178,12 @@ static int pm860x_probe(struct i2c_client *client) */ if (pdata->companion_addr && (pdata->companion_addr != client->addr)) { chip->companion_addr = pdata->companion_addr; - chip->companion = i2c_new_dummy(chip->client->adapter, + chip->companion = i2c_new_dummy_device(chip->client->adapter, chip->companion_addr); - if (!chip->companion) { + if (IS_ERR(chip->companion)) { dev_err(&client->dev, "Failed to allocate I2C companion device\n"); - return -ENODEV; + return PTR_ERR(chip->companion); } chip->regmap_companion = regmap_init_i2c(chip->companion, &pm860x_regmap_config); |