diff mbox

drivers: net: davinci_cpdma: drop devm_kfree of devm_kzalloc'd data

Message ID 20140810195819.GA3880@himangi-Dell
State Deferred, archived
Delegated to: David Miller
Headers show

Commit Message

Himangi Saraogi Aug. 10, 2014, 7:58 p.m. UTC
devm_kfree should not have to be explicitly used.

The Coccinelle semantic patch that fixes this problem is as follows:

// <smpl>
@@
expression x,d;
@@

x = devm_kzalloc(...)
...
?-devm_kfree(d,x);
// </smpl>

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
 drivers/net/ethernet/ti/davinci_cpdma.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Daniel Mack Aug. 10, 2014, 8:26 p.m. UTC | #1
On 08/10/2014 09:58 PM, Himangi Saraogi wrote:
> devm_kfree should not have to be explicitly used.
> 
> The Coccinelle semantic patch that fixes this problem is as follows:
> 
> // <smpl>
> @@
> expression x,d;
> @@
> 
> x = devm_kzalloc(...)
> ...
> ?-devm_kfree(d,x);
> // </smpl>
> 
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>

Acked-by: Daniel Mack <zonque@gmail.com>

However, you need to resend this patch after 3.17-rc1 has been released
and the net-next branch was opened again.


Thanks,
Daniel


> ---
>  drivers/net/ethernet/ti/davinci_cpdma.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
> index 4a000f6..af673f5 100644
> --- a/drivers/net/ethernet/ti/davinci_cpdma.c
> +++ b/drivers/net/ethernet/ti/davinci_cpdma.c
> @@ -512,7 +512,6 @@ struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num,
>  	spin_lock_irqsave(&ctlr->lock, flags);
>  	if (ctlr->channels[chan_num]) {
>  		spin_unlock_irqrestore(&ctlr->lock, flags);
> -		devm_kfree(ctlr->dev, chan);
>  		return ERR_PTR(-EBUSY);
>  	}
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 4a000f6..af673f5 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -512,7 +512,6 @@  struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num,
 	spin_lock_irqsave(&ctlr->lock, flags);
 	if (ctlr->channels[chan_num]) {
 		spin_unlock_irqrestore(&ctlr->lock, flags);
-		devm_kfree(ctlr->dev, chan);
 		return ERR_PTR(-EBUSY);
 	}