[PATCH] gpio: gpiolib: use devm_* API to simplify driver code

[PATCH] gpio: gpiolib: use devm_* API to simplify driver code

[Peng Fan]

Use devm_* API to simplify driver code.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
---
 drivers/gpio/gpiolib.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 6bc612b..f9470b0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -243,7 +243,8 @@ int gpiochip_add(struct gpio_chip *chip)
 	int		base = chip->base;
 	struct gpio_desc *descs;
 
-	descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL);
+	descs = devm_kcalloc(chip->dev, chip->ngpio, sizeof(descs[0]),
+			     GFP_KERNEL);
 	if (!descs)
 		return -ENOMEM;
 
@@ -254,7 +255,7 @@ int gpiochip_add(struct gpio_chip *chip)
 		if (base < 0) {
 			status = base;
 			spin_unlock_irqrestore(&gpio_lock, flags);
-			goto err_free_descs;
+			goto err_descs;
 		}
 		chip->base = base;
 	}
@@ -262,7 +263,7 @@ int gpiochip_add(struct gpio_chip *chip)
 	status = gpiochip_add_to_list(chip);
 	if (status) {
 		spin_unlock_irqrestore(&gpio_lock, flags);
-		goto err_free_descs;
+		goto err_descs;
 	}
 
 	for (id = 0; id < chip->ngpio; id++) {
@@ -308,9 +309,7 @@ err_remove_chip:
 	list_del(&chip->list);
 	spin_unlock_irqrestore(&gpio_lock, flags);
 	chip->desc = NULL;
-err_free_descs:
-	kfree(descs);
-
+err_descs:
 	/* failures here can mean systems won't boot... */
 	pr_err("%s: GPIOs %d..%d (%s) failed to register\n", __func__,
 		chip->base, chip->base + chip->ngpio - 1,
-- 
1.8.4.5

Re: [PATCH] gpio: gpiolib: use devm_* API to simplify driver code

[Grygorii Strashko]

On 08/24/2015 03:05 PM, Peng Fan wrote:
> Use devm_* API to simplify driver code.
>
> Signed-off-by: Peng Fan <van.freenix@gmail.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Alexandre Courbot <gnurou@gmail.com>
  ---
>   drivers/gpio/gpiolib.c | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> index 6bc612b..f9470b0 100644
> --- a/drivers/gpio/gpiolib.c
> +++ b/drivers/gpio/gpiolib.c
> @@ -243,7 +243,8 @@ int gpiochip_add(struct gpio_chip *chip)
>   	int		base = chip->base;
>   	struct gpio_desc *descs;
>
> -	descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL);
> +	descs = devm_kcalloc(chip->dev, chip->ngpio, sizeof(descs[0]),
> +			     GFP_KERNEL);

^ above will not work for every one as NOT all GPIO drivers
implemented using dev/drv model, so chip->dev could be not set
(at least it was true when I've checked it last time).




-- 
regards,
-grygorii

Re: [PATCH] gpio: gpiolib: use devm_* API to simplify driver code

[Alexandre Courbot]

On Tue, Aug 25, 2015 at 5:38 PM, Grygorii Strashko
<grygorii.strashko@ti.com> wrote:
> On 08/24/2015 03:05 PM, Peng Fan wrote:
>>
>> Use devm_* API to simplify driver code.
>>
>> Signed-off-by: Peng Fan <van.freenix@gmail.com>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: Alexandre Courbot <gnurou@gmail.com>
>
>  ---
>>
>>   drivers/gpio/gpiolib.c | 11 +++++------
>>   1 file changed, 5 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
>> index 6bc612b..f9470b0 100644
>> --- a/drivers/gpio/gpiolib.c
>> +++ b/drivers/gpio/gpiolib.c
>> @@ -243,7 +243,8 @@ int gpiochip_add(struct gpio_chip *chip)
>>         int             base = chip->base;
>>         struct gpio_desc *descs;
>>
>> -       descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL);
>> +       descs = devm_kcalloc(chip->dev, chip->ngpio, sizeof(descs[0]),
>> +                            GFP_KERNEL);
>
>
> ^ above will not work for every one as NOT all GPIO drivers
> implemented using dev/drv model, so chip->dev could be not set
> (at least it was true when I've checked it last time).

AFAICT that is still true as of today.

Re: [PATCH] gpio: gpiolib: use devm_* API to simplify driver code

[Peng Fan]

On Tue, Aug 25, 2015 at 11:38:47AM +0300, Grygorii Strashko wrote:
> On 08/24/2015 03:05 PM, Peng Fan wrote:
> >Use devm_* API to simplify driver code.
> >
> >Signed-off-by: Peng Fan <van.freenix@gmail.com>
> >Cc: Linus Walleij <linus.walleij@linaro.org>
> >Cc: Alexandre Courbot <gnurou@gmail.com>
>  ---
> >  drivers/gpio/gpiolib.c | 11 +++++------
> >  1 file changed, 5 insertions(+), 6 deletions(-)
> >
> >diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> >index 6bc612b..f9470b0 100644
> >--- a/drivers/gpio/gpiolib.c
> >+++ b/drivers/gpio/gpiolib.c
> >@@ -243,7 +243,8 @@ int gpiochip_add(struct gpio_chip *chip)
> >  	int		base = chip->base;
> >  	struct gpio_desc *descs;
> >
> >-	descs = kcalloc(chip->ngpio, sizeof(descs[0]), GFP_KERNEL);
> >+	descs = devm_kcalloc(chip->dev, chip->ngpio, sizeof(descs[0]),
> >+			     GFP_KERNEL);
> 
> ^ above will not work for every one as NOT all GPIO drivers
> implemented using dev/drv model, so chip->dev could be not set
> (at least it was true when I've checked it last time).
> 

Thanks for correcting me!

Regards,
Peng.

> 
> 
> 
> -- 
> regards,
> -grygorii