Commit b1224cd1 authored Jul 13, 2011 by Jesper Juhl Committed by Samuel Ortiz Jul 31, 2011

mfd: Avoid two assignments if failures happen in tps65910_i2c_probe



In drivers/mfd/tps65910.c:tps65910_i2c_probe() there's potential for a
tiny optimization.

We assign to init_data->irq and init_data->irq_base long before we
need them, and there are two potential exits from the function before
they are needed.

Moving the assignments below these two potential exits means we
completely avoid doing them in these two (failure) cases.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 6daa663d

drivers/mfd/tps65910.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -147,9 +147,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
		if (init_data == NULL)
		return -ENOMEM;

		init_data->irq = pmic_plat_data->irq;
		init_data->irq_base = pmic_plat_data->irq;

		tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
		if (tps65910 == NULL) {
		kfree(init_data);
		@@ -170,6 +167,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
		if (ret < 0)
		goto err;

		init_data->irq = pmic_plat_data->irq;
		init_data->irq_base = pmic_plat_data->irq;

		tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);

		ret = tps65910_irq_init(tps65910, init_data->irq, init_data);

Admin message