Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754746AbcDAKgz (ORCPT ); Fri, 1 Apr 2016 06:36:55 -0400 Received: from mail-lf0-f52.google.com ([209.85.215.52]:33946 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752424AbcDAKgw (ORCPT ); Fri, 1 Apr 2016 06:36:52 -0400 Subject: Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe To: Bin Liu , David Lechner , petr@barix.com, David.Laight@ACULAB.COM, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Sekhar Nori , Kevin Hilman , Kishon Vijay Abraham I , Greg Kroah-Hartman , Alan Stern , Lee Jones , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list , "moderated list:ARM PORT" , "open list:USB SUBSYSTEM" References: <1458863503-31121-1-git-send-email-david@lechnology.com> <1458863503-31121-16-git-send-email-david@lechnology.com> <20160331222112.GA28044@uda0271908> From: Sergei Shtylyov Message-ID: <56FE4F3D.9040209@cogentembedded.com> Date: Fri, 1 Apr 2016 13:36:45 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.1 MIME-Version: 1.0 In-Reply-To: <20160331222112.GA28044@uda0271908> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1983 Lines: 81 Hello. On 4/1/2016 1:21 AM, Bin Liu wrote: >> Simplify things a bit by using devm functions where possible. >> >> Signed-off-by: David Lechner >> --- >> >> v3 changes: >> >> * Kept clk variable to minimize noise. >> >> >> drivers/usb/musb/da8xx.c | 19 +++++-------------- >> 1 file changed, 5 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c >> index b03d3b8..0c1997c 100644 >> --- a/drivers/usb/musb/da8xx.c >> +++ b/drivers/usb/musb/da8xx.c >> @@ -490,20 +490,18 @@ static int da8xx_probe(struct platform_device *pdev) >> struct da8xx_glue *glue; >> struct platform_device_info pinfo; >> struct clk *clk; >> + int ret; >> >> - int ret = -ENOMEM; >> - >> - 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). No, since devm_kzalloc() was used, the memory will be automatically freed on returning error by da8xx_probe(). >> } >> >> ret = clk_enable(clk); >> @@ -560,12 +558,7 @@ err5: >> clk_disable(clk); >> >> err4: >> - clk_put(clk); >> - >> -err3: >> - kfree(glue); >> >> -err0: >> return ret; >> } >> >> @@ -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. Again, these are now done automatically. > Regards, > -Bin. MBR, Sergei