Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Wolfram Sang and committed by
Lee Jones
ddbf6ffe b8afcd54

+6 -6
+6 -6
drivers/mfd/max8925-i2c.c
··· 176 176 dev_set_drvdata(chip->dev, chip); 177 177 mutex_init(&chip->io_lock); 178 178 179 - chip->rtc = i2c_new_dummy(chip->i2c->adapter, RTC_I2C_ADDR); 180 - if (!chip->rtc) { 179 + chip->rtc = i2c_new_dummy_device(chip->i2c->adapter, RTC_I2C_ADDR); 180 + if (IS_ERR(chip->rtc)) { 181 181 dev_err(chip->dev, "Failed to allocate I2C device for RTC\n"); 182 - return -ENODEV; 182 + return PTR_ERR(chip->rtc); 183 183 } 184 184 i2c_set_clientdata(chip->rtc, chip); 185 185 186 - chip->adc = i2c_new_dummy(chip->i2c->adapter, ADC_I2C_ADDR); 187 - if (!chip->adc) { 186 + chip->adc = i2c_new_dummy_device(chip->i2c->adapter, ADC_I2C_ADDR); 187 + if (IS_ERR(chip->adc)) { 188 188 dev_err(chip->dev, "Failed to allocate I2C device for ADC\n"); 189 189 i2c_unregister_device(chip->rtc); 190 - return -ENODEV; 190 + return PTR_ERR(chip->adc); 191 191 } 192 192 i2c_set_clientdata(chip->adc, chip); 193 193