瀏覽代碼

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>
Jesper Juhl 14 年之前
父節點
當前提交
b1224cd113
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/mfd/tps65910.c

+ 3 - 3
drivers/mfd/tps65910.c

@@ -147,9 +147,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 	if (init_data == NULL)
 	if (init_data == NULL)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
-	init_data->irq = pmic_plat_data->irq;
-	init_data->irq_base = pmic_plat_data->irq;
-
 	tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
 	tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
 	if (tps65910 == NULL) {
 	if (tps65910 == NULL) {
 		kfree(init_data);
 		kfree(init_data);
@@ -170,6 +167,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 	if (ret < 0)
 	if (ret < 0)
 		goto err;
 		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);
 	tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
 
 
 	ret = tps65910_irq_init(tps65910, init_data->irq, init_data);
 	ret = tps65910_irq_init(tps65910, init_data->irq, init_data);