Commit 4e32bff6 authored by Wolfram Sang's avatar Wolfram Sang Committed by Lee Jones
Browse files

mfd: max8997: 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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ddbf6ffe

drivers/mfd/max8997.c

+9 −9
Original line number Diff line number Diff line
@@ -185,25 +185,25 @@ static int max8997_i2c_probe(struct i2c_client *i2c, 


	mutex_init(&max8997->iolock);



	max8997->rtc = i2c_new_dummy(i2c->adapter, I2C_ADDR_RTC);

	if (!max8997->rtc) {

	max8997->rtc = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_RTC);

	if (IS_ERR(max8997->rtc)) {

		dev_err(max8997->dev, "Failed to allocate I2C device for RTC\n");

		return -ENODEV;

		return PTR_ERR(max8997->rtc);

	}

	i2c_set_clientdata(max8997->rtc, max8997);



	max8997->haptic = i2c_new_dummy(i2c->adapter, I2C_ADDR_HAPTIC);

	if (!max8997->haptic) {

	max8997->haptic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_HAPTIC);

	if (IS_ERR(max8997->haptic)) {

		dev_err(max8997->dev, "Failed to allocate I2C device for Haptic\n");

		ret = -ENODEV;

		ret = PTR_ERR(max8997->haptic);

		goto err_i2c_haptic;

	}

	i2c_set_clientdata(max8997->haptic, max8997);



	max8997->muic = i2c_new_dummy(i2c->adapter, I2C_ADDR_MUIC);

	if (!max8997->muic) {

	max8997->muic = i2c_new_dummy_device(i2c->adapter, I2C_ADDR_MUIC);

	if (IS_ERR(max8997->muic)) {

		dev_err(max8997->dev, "Failed to allocate I2C device for MUIC\n");

		ret = -ENODEV;

		ret = PTR_ERR(max8997->muic);

		goto err_i2c_muic;

	}

	i2c_set_clientdata(max8997->muic, max8997);