[PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Julia Lawall]

From: Julia Lawall <Julia.Lawall@lip6.fr>

The function at91_dt_node_to_map is ultimately called by the function
pinctrl_get, which is an exported function.  Since it is possible that this
function is not called from within a probe function, for safety, the kfree
is converted to a devm_kfree, to both free the data and remove it from the
device in a failure situation.

A newline is added in the call to devm_kfree to avoid exceeding the 80
character limit.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/pinctrl/pinctrl-at91.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index c5e7571..0da8a5f 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -255,7 +255,8 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
 	}
 
 	map_num += grp->npins;
-	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num, GFP_KERNEL);
+	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num,
+			       GFP_KERNEL);
 	if (!new_map)
 		return -ENOMEM;
 
@@ -265,7 +266,7 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
 	/* create mux map */
 	parent = of_get_parent(np);
 	if (!parent) {
-		kfree(new_map);
+		devm_kfree(pctldev->dev, new_map);
 		return -EINVAL;
 	}
 	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Sergei Shtylyov]

Hello.

On 11-12-2012 14:58, Julia Lawall wrote:

> From: Julia Lawall <Julia.Lawall@lip6.fr>

> The function at91_dt_node_to_map is ultimately called by the function
> pinctrl_get, which is an exported function.  Since it is possible that this
> function is not called from within a probe function, for safety, the kfree
> is converted to a devm_kfree, to both free the data and remove it from the
> device in a failure situation.

> A newline is added in the call to devm_kfree to avoid exceeding the 80

    devm_kzalloc() you mean?

> character limit.

> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

> ---
>   drivers/pinctrl/pinctrl-at91.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index c5e7571..0da8a5f 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -255,7 +255,8 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
>   	}
>
>   	map_num += grp->npins;
> -	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num, GFP_KERNEL);
> +	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num,
> +			       GFP_KERNEL);

WBR, Sergei

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Julia Lawall]

On Tue, 11 Dec 2012, Sergei Shtylyov wrote:

> Hello.
>
> On 11-12-2012 14:58, Julia Lawall wrote:
>
> > From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> > The function at91_dt_node_to_map is ultimately called by the function
> > pinctrl_get, which is an exported function.  Since it is possible that this
> > function is not called from within a probe function, for safety, the kfree
> > is converted to a devm_kfree, to both free the data and remove it from the
> > device in a failure situation.
>
> > A newline is added in the call to devm_kfree to avoid exceeding the 80
>
>    devm_kzalloc() you mean?

Yes, sorry.  Should I send a new patch?

thanks,
julia

> > character limit.
>
> > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> > ---
> >   drivers/pinctrl/pinctrl-at91.c |    5 +++--
> >   1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> > index c5e7571..0da8a5f 100644
> > --- a/drivers/pinctrl/pinctrl-at91.c
> > +++ b/drivers/pinctrl/pinctrl-at91.c
> > @@ -255,7 +255,8 @@ static int at91_dt_node_to_map(struct pinctrl_dev
> > *pctldev,
> >   	}
> >
> >   	map_num += grp->npins;
> > -	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num,
> > GFP_KERNEL);
> > +	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num,
> > +			       GFP_KERNEL);
>
> WBR, Sergei
>
>
>

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Sergei Shtylyov]

Hello.

On 12/11/2012 04:08 PM, Julia Lawall wrote:

>>> From: Julia Lawall <Julia.Lawall@lip6.fr>

>>> The function at91_dt_node_to_map is ultimately called by the function
>>> pinctrl_get, which is an exported function.  Since it is possible that this
>>> function is not called from within a probe function, for safety, the kfree
>>> is converted to a devm_kfree, to both free the data and remove it from the
>>> device in a failure situation.
>>
>>> A newline is added in the call to devm_kfree to avoid exceeding the 80
>>
>>    devm_kzalloc() you mean?

> Yes, sorry.  Should I send a new patch?

   Up to the maintainer I guess...

> thanks,
> julia

WBR, Sergei

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:58 Tue 11 Dec     , Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> The function at91_dt_node_to_map is ultimately called by the function
> pinctrl_get, which is an exported function.  Since it is possible that this
> function is not called from within a probe function, for safety, the kfree
> is converted to a devm_kfree, to both free the data and remove it from the
> device in a failure situation.
> 
> A newline is added in the call to devm_kfree to avoid exceeding the 80
> character limit.
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
>  drivers/pinctrl/pinctrl-at91.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index c5e7571..0da8a5f 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -255,7 +255,8 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
>  	}
>  
>  	map_num += grp->npins;
> -	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num, GFP_KERNEL);
> +	new_map = devm_kzalloc(pctldev->dev, sizeof(*new_map) * map_num,
> +			       GFP_KERNEL);
not related please drop
>  	if (!new_map)
>  		return -ENOMEM;
>  
> @@ -265,7 +266,7 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
>  	/* create mux map */
>  	parent = of_get_parent(np);
>  	if (!parent) {
> -		kfree(new_map);
> +		devm_kfree(pctldev->dev, new_map);
ok
>  		return -EINVAL;
>  	}
>  	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
>
Best Regards,
J.
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Julia Lawall]

From: Julia Lawall <Julia.Lawall@lip6.fr>

The function at91_dt_node_to_map is ultimately called by the function
pinctrl_get, which is an exported function.  Since it is possible that this
function is not called from within a probe function, for safety, the kfree
is converted to a devm_kfree, to both free the data and remove it from the
device in a failure situation.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
v2: Drop cleanup of the call to devm_kzalloc at the same time.

 drivers/pinctrl/pinctrl-at91.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index c5e7571..bff54bf 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -265,7 +265,7 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
 	/* create mux map */
 	parent = of_get_parent(np);
 	if (!parent) {
-		kfree(new_map);
+		devm_kfree(pctldev->dev, new_map);
 		return -EINVAL;
 	}
 	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Jean-Christophe PLAGNIOL-VILLARD]

On 15:22 Wed 12 Dec     , Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> The function at91_dt_node_to_map is ultimately called by the function
> pinctrl_get, which is an exported function.  Since it is possible that this
> function is not called from within a probe function, for safety, the kfree
> is converted to a devm_kfree, to both free the data and remove it from the
> device in a failure situation.
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.

Re: [PATCH] drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree

[Linus Walleij]

On Wed, Dec 12, 2012 at 3:22 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:

> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> The function at91_dt_node_to_map is ultimately called by the function
> pinctrl_get, which is an exported function.  Since it is possible that this
> function is not called from within a probe function, for safety, the kfree
> is converted to a devm_kfree, to both free the data and remove it from the
> device in a failure situation.
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> v2: Drop cleanup of the call to devm_kzalloc at the same time.

Thanks, applied with Jean-Christophe's ACK.

Yours,
Linus Walleij