hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mfd: max8925-i2c: 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>
This commit is contained in:
Wolfram Sang 2019-07-22 19:26:17 +02:00 committed by Lee Jones
parent b8afcd54db
commit ddbf6ffeb6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/max8925-i2c.c
View File

@ -176,18 +176,18 @@ static int max8925_probe(struct i2c_client *client,
dev_set_drvdata(chip->dev, chip); dev_set_drvdata(chip->dev, chip);
mutex_init(&chip->io_lock); mutex_init(&chip->io_lock);
chip->rtc = i2c_new_dummy(chip->i2c->adapter, RTC_I2C_ADDR); chip->rtc = i2c_new_dummy_device(chip->i2c->adapter, RTC_I2C_ADDR);
if (!chip->rtc) { if (IS_ERR(chip->rtc)) {
dev_err(chip->dev, "Failed to allocate I2C device for RTC\n"); dev_err(chip->dev, "Failed to allocate I2C device for RTC\n");
return -ENODEV; return PTR_ERR(chip->rtc);
} }
i2c_set_clientdata(chip->rtc, chip); i2c_set_clientdata(chip->rtc, chip);
chip->adc = i2c_new_dummy(chip->i2c->adapter, ADC_I2C_ADDR); chip->adc = i2c_new_dummy_device(chip->i2c->adapter, ADC_I2C_ADDR);
if (!chip->adc) { if (IS_ERR(chip->adc)) {
dev_err(chip->dev, "Failed to allocate I2C device for ADC\n"); dev_err(chip->dev, "Failed to allocate I2C device for ADC\n");
i2c_unregister_device(chip->rtc); i2c_unregister_device(chip->rtc);
return -ENODEV; return PTR_ERR(chip->adc);
} }
i2c_set_clientdata(chip->adc, chip); i2c_set_clientdata(chip->adc, chip);