[PATCH] mfd: tps6586x: Invert GPIO and subdevices initialization

From: Vincent Palatin
Date: Wed Jan 19 2011 - 09:52:26 EST


When using a fixed voltage regulator triggered by a TPS6586x GPIO,
this allows to declare and initialize it conveniently from the "subdev" list.

Signed-off-by: Vincent Palatin <vpalatin@xxxxxxxxxxxx>
---
drivers/mfd/tps6586x.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 627cf57..fdb16ed 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -517,19 +517,25 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
}
}

+ tps6586x_gpio_init(tps6586x, pdata->gpio_base);
+
ret = tps6586x_add_subdevs(tps6586x, pdata);
if (ret) {
dev_err(&client->dev, "add devices failed: %d\n", ret);
goto err_add_devs;
}

- tps6586x_gpio_init(tps6586x, pdata->gpio_base);
-
return 0;

err_add_devs:
if (client->irq)
free_irq(client->irq, tps6586x);
+ if (pdata->gpio_base) {
+ ret = gpiochip_remove(&tps6586x->gpio);
+ if (ret)
+ dev_err(&client->dev, "Can't remove gpio chip: %d\n",
+ ret);
+ }
err_irq_init:
kfree(tps6586x);
return ret;
--
1.7.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/