2010-08-24 07:15:55

by Axel Lin

Subject: [PATCH v2] mfd: tps6586x - free allocated resources when unload the module

For the resources allocated in tps6586x_i2c_probe(),
we need to free it in tps6586x_i2c_remove().

Signed-off-by: Axel Lin <[email protected]>
---
Changes since V1:
Current implementation allows gpiochip_add() fail in probe,
thus just show a wraning if gpiochip_remove() fail.

I don't have this hardware handy,
I am not sure that does it make sense to allow gpiochip_add() fail in probe.

drivers/mfd/tps6586x.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 1c91936..2f9336c 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -344,6 +344,19 @@ err_add_devs:

static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
{
+ struct tps6586x *tps6586x = i2c_get_clientdata(client);
+ struct tps6586x_platform_data *pdata = client->dev.platform_data;
+ int ret;
+
+ if (pdata->gpio_base) {
+ ret = gpiochip_remove(&tps6586x->gpio);
+ if (ret)
+ dev_err(&client->dev, "Can't remove gpio chip: %d\n",
+ ret);
+ }
+
+ tps6586x_remove_subdevs(tps6586x);
+ kfree(tps6586x);
return 0;
}

--
1.7.2

2010-08-24 09:01:02

by Eric Miao

Subject: Re: [PATCH v2] mfd: tps6586x - free allocated resources when unload the module

On Tue, Aug 24, 2010 at 3:18 PM, Axel Lin <[email protected]> wrote:
> For the resources allocated in tps6586x_i2c_probe(),
> we need to free it in tps6586x_i2c_remove().
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> Changes since V1:
> Current implementation allows gpiochip_add() fail in probe,
> thus just show a wraning if gpiochip_remove() fail.
>
> I don't have this hardware handy,
> I am not sure that does it make sense to allow gpiochip_add() fail in probe.

That's fully possible.

>
>  drivers/mfd/tps6586x.c |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index 1c91936..2f9336c 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -344,6 +344,19 @@ err_add_devs:
>
>  static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
>  {
> +       struct tps6586x *tps6586x = i2c_get_clientdata(client);
> +       struct tps6586x_platform_data *pdata = client->dev.platform_data;
> +       int ret;
> +
> +       if (pdata->gpio_base) {
> +               ret = gpiochip_remove(&tps6586x->gpio);
> +               if (ret)
> +                       dev_err(&client->dev, "Can't remove gpio chip: %d\n",
> +                               ret);
> +       }
> +
> +       tps6586x_remove_subdevs(tps6586x);
> +       kfree(tps6586x);
>        return 0;
>  }
>
> --
> 1.7.2
>
>
>
>