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

mfd: tps80031: Convert to devm_i2c_new_dummy_device 



Move from i2c_new_dummy() to devm_i2c_new_dummy_device(). So, we now get
an ERRPTR which we use in error handling and we can skip removal of the
created devices.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 624e3fce

drivers/mfd/tps80031.c

+8 −15
Original line number Diff line number Diff line
@@ -437,12 +437,11 @@ static int tps80031_probe(struct i2c_client *client, 
		if (tps80031_slave_address[i] == client->addr)

			tps80031->clients[i] = client;

		else

			tps80031->clients[i] = i2c_new_dummy(client->adapter,

						tps80031_slave_address[i]);

		if (!tps80031->clients[i]) {

			tps80031->clients[i] = devm_i2c_new_dummy_device(&client->dev,

						client->adapter, tps80031_slave_address[i]);

		if (IS_ERR(tps80031->clients[i])) {

			dev_err(&client->dev, "can't attach client %d\n", i);

			ret = -ENOMEM;

			goto fail_client_reg;

			return PTR_ERR(tps80031->clients[i]);

		}



		i2c_set_clientdata(tps80031->clients[i], tps80031);
@@ -452,7 +451,7 @@ static int tps80031_probe(struct i2c_client *client, 
			ret = PTR_ERR(tps80031->regmap[i]);

			dev_err(&client->dev,

				"regmap %d init failed, err %d\n", i, ret);

			goto fail_client_reg;

			return ret;

		}

	}
@@ -461,7 +460,7 @@ static int tps80031_probe(struct i2c_client *client, 
	if (ret < 0) {

		dev_err(&client->dev,

			"Silicon version number read failed: %d\n", ret);

		goto fail_client_reg;

		return ret;

	}



	ret = tps80031_read(&client->dev, TPS80031_SLAVE_ID3,
@@ -469,7 +468,7 @@ static int tps80031_probe(struct i2c_client *client, 
	if (ret < 0) {

		dev_err(&client->dev,

			"Silicon eeprom version read failed: %d\n", ret);

		goto fail_client_reg;

		return ret;

	}



	dev_info(&client->dev, "ES version 0x%02x and EPROM version 0x%02x\n",
@@ -482,7 +481,7 @@ static int tps80031_probe(struct i2c_client *client, 
	ret = tps80031_irq_init(tps80031, client->irq, pdata->irq_base);

	if (ret) {

		dev_err(&client->dev, "IRQ init failed: %d\n", ret);

		goto fail_client_reg;

		return ret;

	}



	tps80031_pupd_init(tps80031, pdata);
@@ -506,12 +505,6 @@ static int tps80031_probe(struct i2c_client *client, 


fail_mfd_add:

	regmap_del_irq_chip(client->irq, tps80031->irq_data);



fail_client_reg:

	for (i = 0; i < TPS80031_NUM_SLAVES; i++) {

		if (tps80031->clients[i]  && (tps80031->clients[i] != client))

			i2c_unregister_device(tps80031->clients[i]);

	}

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE