diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 19:26:11 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2019-08-12 09:51:58 +0200 |
| commit | 98f0c05f409e4fbf186b11dcb2baed84a253c224 (patch) | |
| tree | 20f3912de073a9f9aab614521d5a483fe0f7c75f /drivers/mfd | |
| parent | mfd: ab3100-core: Convert to i2c_new_dummy_device (diff) | |
| download | linux-98f0c05f409e4fbf186b11dcb2baed84a253c224.tar.xz linux-98f0c05f409e4fbf186b11dcb2baed84a253c224.zip | |
mfd: bcm590xx: 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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/bcm590xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c index 1aeb5e498d91..bfac5dc091ca 100644 --- a/drivers/mfd/bcm590xx.c +++ b/drivers/mfd/bcm590xx.c @@ -61,11 +61,11 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri, } /* Secondary I2C slave address is the base address with A(2) asserted */ - bcm590xx->i2c_sec = i2c_new_dummy(i2c_pri->adapter, + bcm590xx->i2c_sec = i2c_new_dummy_device(i2c_pri->adapter, i2c_pri->addr | BIT(2)); - if (!bcm590xx->i2c_sec) { + if (IS_ERR(bcm590xx->i2c_sec)) { dev_err(&i2c_pri->dev, "failed to add secondary I2C device\n"); - return -ENODEV; + return PTR_ERR(bcm590xx->i2c_sec); } i2c_set_clientdata(bcm590xx->i2c_sec, bcm590xx); |