summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-07-13 23:22:26 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-07-31 23:28:26 +0200
commitb1224cd113d4441edee4a58a1e2e428141247c0d (patch)
treee3edb8c7f024d5df4d90a1ecfbf171c10343d684 /drivers/mfd
parent6daa663dc42957ca6c794a84fe07fa09f0273ff9 (diff)
downloadop-kernel-dev-b1224cd113d4441edee4a58a1e2e428141247c0d.zip
op-kernel-dev-b1224cd113d4441edee4a58a1e2e428141247c0d.tar.gz
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps65910.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 0226cde..6f5b8cf 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -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);
OpenPOWER on IntegriCloud