From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Neil Armstrong <narmstrong@baylibre.com>,
"David S. Miller" <davem@davemloft.net>,
Jesper Dangaard Brouer <brouer@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] net: dsa: Use devm_ prefixed allocations
Date: Fri, 2 Oct 2015 16:29:32 +0300 [thread overview]
Message-ID: <560E86BC.3090104@cogentembedded.com> (raw)
In-Reply-To: <560E60E4.8020706@baylibre.com>
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 <andrew@lunn.ch>
> Tested-by: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> 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
next prev parent reply other threads:[~2015-10-02 13:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 10:48 [PATCH 1/3] net: dsa: Use devm_ prefixed allocations Neil Armstrong
2015-10-02 13:25 ` Felix Fietkau
2015-10-02 13:29 ` Sergei Shtylyov [this message]
2015-10-02 13:30 ` Neil Armstrong
2015-10-02 13:37 ` Sergei Shtylyov
2015-10-03 12:39 ` Felix Fietkau
2015-10-03 13:55 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=560E86BC.3090104@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).