From: david@lechnology.com (David Lechner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe
Date: Thu, 31 Mar 2016 17:28:48 -0500 [thread overview]
Message-ID: <56FDA4A0.6080106@lechnology.com> (raw)
In-Reply-To: <20160331222112.GA28044@uda0271908>
On 03/31/2016 05:21 PM, Bin Liu wrote:
>> - glue = kzalloc(sizeof(*glue), GFP_KERNEL);
>> + glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
>> if (!glue) {
>> dev_err(&pdev->dev, "failed to allocate glue context\n");
>> - goto err0;
>> + return -ENOMEM;
>> }
>>
>> - clk = clk_get(&pdev->dev, "usb20");
>> + clk = devm_clk_get(&pdev->dev, "usb20");
>> if (IS_ERR(clk)) {
>> dev_err(&pdev->dev, "failed to get clock\n");
>> - ret = PTR_ERR(clk);
>> - goto err3;
>> + return PTR_ERR(clk);
>
> memory leak due to not kfree(glue).
It is my understanding that since glue is allocated with devm_kzalloc(),
that if the probe function returns and error, glue and everything else
allocated with devm_* will be automatically freed.
If this is not the case, wouldn't devm_kfree() be the appropriate
function instead?
>> @@ -576,8 +569,6 @@ static int da8xx_remove(struct platform_device *pdev)
>> platform_device_unregister(glue->musb);
>> usb_phy_generic_unregister(glue->phy);
>> clk_disable(glue->clk);
>> - clk_put(glue->clk);
>> - kfree(glue);
>
> Doesn't match with $subject, I'd put them into a seperate patch.
I disagree. Since these are now automatically freed because of changes
in the probe function, these changes belong in the same patch.
next prev parent reply other threads:[~2016-03-31 22:28 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 23:51 [PATCH v3 00/16] da8xx USB clocks David Lechner
2016-03-24 23:51 ` [PATCH v3 01/16] dt: davinci: use proper address after @ David Lechner
2016-03-25 13:29 ` Sergei Shtylyov
2016-03-25 15:13 ` Rob Herring
2016-03-25 16:36 ` Sergei Shtylyov
2016-03-25 15:14 ` Rob Herring
2016-04-11 8:19 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 02/16] mfd: da8xx-cfgchip: New header file for CFGCHIP registers David Lechner
2016-03-25 17:22 ` Sergei Shtylyov
2016-03-28 15:02 ` David Lechner
2016-03-28 16:42 ` Sergei Shtylyov
2016-04-11 8:23 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 03/16] ARM: davinici: da8xx: move usb code to new file David Lechner
2016-04-11 8:55 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 04/16] ARM: davinci: Move clock init after ioremap David Lechner
2016-04-11 9:14 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 05/16] ARM: davinci: add set_parent callback for mux clocks David Lechner
2016-04-11 10:40 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 06/16] ARM: davinci: da850: use clk->set_parent for async3 David Lechner
2016-04-11 10:49 ` Sekhar Nori
2016-03-24 23:51 ` [PATCH v3 07/16] ARM: davinci: da8xx: add usb phy clocks David Lechner
2016-03-24 23:51 ` [PATCH v3 08/16] dt-bindings: Add bindings for phy-da8xx-usb David Lechner
2016-03-25 15:04 ` Rob Herring
2016-03-24 23:51 ` [PATCH v3 09/16] phy: da8xx-usb: new driver for DA8xx SoC USB PHY David Lechner
2016-03-25 1:57 ` [PATCH] " David Lechner
2016-03-26 14:10 ` Sergei Shtylyov
2016-04-13 13:20 ` [PATCH v3 09/16] " Kishon Vijay Abraham I
2016-04-13 20:07 ` David Lechner
2016-04-14 12:38 ` Kishon Vijay Abraham I
2016-03-24 23:51 ` [PATCH v3 10/16] ARM: davinci: da8xx: Add CFGCHIPn syscon platform declaration David Lechner
2016-03-24 23:51 ` [PATCH v3 11/16] ARM: davinci: da8xx: Add USB PHY " David Lechner
2016-03-24 23:51 ` [PATCH v3 12/16] ARM: dt: da850: Add cfgchip syscon node David Lechner
2016-03-24 23:51 ` [PATCH v3 13/16] ARM: dt: da850: Add usb phy node David Lechner
2016-03-24 23:51 ` [PATCH v3 14/16] usb: ohci-da8xx: Remove code that references mach David Lechner
2016-03-24 23:51 ` [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe David Lechner
2016-03-31 22:21 ` Bin Liu
2016-03-31 22:28 ` David Lechner [this message]
2016-04-01 14:56 ` Bin Liu
2016-04-01 10:36 ` Sergei Shtylyov
2016-03-24 23:51 ` [PATCH v3 16/16] usb: musb: da8xx: Remove mach code David Lechner
2016-04-07 16:29 ` [PATCH v3 00/16] da8xx USB clocks David Lechner
2016-04-11 11:28 ` Sekhar Nori
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=56FDA4A0.6080106@lechnology.com \
--to=david@lechnology.com \
--cc=linux-arm-kernel@lists.infradead.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).