From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753531AbbJBN3p (ORCPT ); Fri, 2 Oct 2015 09:29:45 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:34400 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753102AbbJBN3f (ORCPT ); Fri, 2 Oct 2015 09:29:35 -0400 Subject: Re: [PATCH 1/3] net: dsa: Use devm_ prefixed allocations To: Neil Armstrong , "David S. Miller" , Jesper Dangaard Brouer References: <560E60E4.8020706@baylibre.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Sergei Shtylyov Message-ID: <560E86BC.3090104@cogentembedded.com> Date: Fri, 2 Oct 2015 16:29:32 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <560E60E4.8020706@baylibre.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/2/2015 1:48 PM, Neil Armstrong wrote: > To simplify and prevent memory leakage when unbinding, use > the devm_ memory allocation calls. > > Tested-by: Andrew Lunn > Tested-by: Florian Fainelli > Signed-off-by: Neil Armstrong > --- > net/dsa/dsa.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c > index c59fa5d..98f94c2 100644 > --- a/net/dsa/dsa.c > +++ b/net/dsa/dsa.c > @@ -305,7 +305,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) > if (ret < 0) > goto out; > > - ds->slave_mii_bus = mdiobus_alloc(); > + ds->slave_mii_bus = devm_mdiobus_alloc(parent); > if (ds->slave_mii_bus == NULL) { > ret = -ENOMEM; > goto out; > @@ -400,7 +400,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, > /* > * Allocate and initialise switch state. > */ > - ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL); > + ds = devm_kzalloc(parent, sizeof(*ds) + drv->priv_size, GFP_KERNEL); > if (ds == NULL) > return ERR_PTR(-ENOMEM); > > @@ -883,7 +883,7 @@ static int dsa_probe(struct platform_device *pdev) > goto out; > } > > - dst = kzalloc(sizeof(*dst), GFP_KERNEL); > + dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL); > if (dst == NULL) { > dev_put(dev); > ret = -ENOMEM; > Shouldn't you remove the correspoding kfree(), etc. calls? MBR, Sergei