Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad83533a authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Lee Jones
Browse files

mfd: tps6105x: Use managed resources when allocating memory 



This patch introduces the use of devm_kzalloc instead of the
corresponding unmanaged version and does away with the kfrees in the
probe and remove functions. Also, a label is done away with.

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 23213218

drivers/mfd/tps6105x.c

+4 −13
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int tps6105x_probe(struct i2c_client *client, 
	int ret;

	int i;



	tps6105x = kmalloc(sizeof(*tps6105x), GFP_KERNEL);

	tps6105x = devm_kmalloc(&client->dev, sizeof(*tps6105x), GFP_KERNEL);

	if (!tps6105x)

		return -ENOMEM;
@@ -154,7 +154,7 @@ static int tps6105x_probe(struct i2c_client *client, 
	ret = tps6105x_startup(tps6105x);

	if (ret) {

		dev_err(&client->dev, "chip initialization failed\n");

		goto fail;

		return ret;

	}



	/* Remove warning texts when you implement new cell drivers */
@@ -187,16 +187,8 @@ static int tps6105x_probe(struct i2c_client *client, 
		tps6105x_cells[i].pdata_size = sizeof(*tps6105x);

	}



	ret = mfd_add_devices(&client->dev, 0, tps6105x_cells,

	return mfd_add_devices(&client->dev, 0, tps6105x_cells,

			       ARRAY_SIZE(tps6105x_cells), NULL, 0, NULL);

	if (ret)

		goto fail;



	return 0;



fail:

	kfree(tps6105x);

	return ret;

}



static int tps6105x_remove(struct i2c_client *client)
@@ -210,7 +202,6 @@ static int tps6105x_remove(struct i2c_client *client) 
		TPS6105X_REG0_MODE_MASK,

		TPS6105X_MODE_SHUTDOWN << TPS6105X_REG0_MODE_SHIFT);



	kfree(tps6105x);

	return 0;

}