From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Tobias Schandinat Date: Tue, 28 Feb 2012 15:54:59 +0000 Subject: Re: [PATCH] drivers/video/pxa168fb.c: use devm_ functions Message-Id: <4F4CF8D3.2090007@gmx.de> List-Id: References: <1329589169-18235-1-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1329589169-18235-1-git-send-email-Julia.Lawall@lip6.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Julia Lawall Cc: kernel-janitors@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org On 02/18/2012 06:19 PM, Julia Lawall wrote: > From: Julia Lawall > > The various devm_ functions allocate memory that is released when a driver > detaches. This patch uses these functions for data that is allocated in > the probe function of a platform device and is only freed in the remove > function. > > By using devm_ioremap, it also removes a potential memory leak, because > there was no call to iounmap in the probe function. > > Signed-off-by: Julia Lawall Applied. Thanks, Florian Tobias Schandinat > > --- > drivers/video/pxa168fb.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c > index 8384b94..f146089 100644 > --- a/drivers/video/pxa168fb.c > +++ b/drivers/video/pxa168fb.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -670,7 +671,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > /* > * Map LCD controller registers. > */ > - fbi->reg_base = ioremap_nocache(res->start, resource_size(res)); > + fbi->reg_base = devm_ioremap_nocache(&pdev->dev, res->start, > + resource_size(res)); > if (fbi->reg_base = NULL) { > ret = -ENOMEM; > goto failed_free_info; > @@ -739,8 +741,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > /* > * Register irq handler. > */ > - ret = request_irq(irq, pxa168fb_handle_irq, IRQF_SHARED, > - info->fix.id, fbi); > + ret = devm_request_irq(&pdev->dev, irq, pxa168fb_handle_irq, > + IRQF_SHARED, info->fix.id, fbi); > if (ret < 0) { > dev_err(&pdev->dev, "unable to request IRQ\n"); > ret = -ENXIO; > @@ -759,14 +761,12 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > if (ret < 0) { > dev_err(&pdev->dev, "Failed to register pxa168-fb: %d\n", ret); > ret = -ENXIO; > - goto failed_free_irq; > + goto failed_free_cmap; > } > > platform_set_drvdata(pdev, fbi); > return 0; > > -failed_free_irq: > - free_irq(irq, fbi); > failed_free_cmap: > fb_dealloc_cmap(&info->cmap); > failed_free_clk: > @@ -808,13 +808,10 @@ static int __devexit pxa168fb_remove(struct platform_device *pdev) > fb_dealloc_cmap(&info->cmap); > > irq = platform_get_irq(pdev, 0); > - free_irq(irq, fbi); > > dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len), > info->screen_base, info->fix.smem_start); > > - iounmap(fbi->reg_base); > - > clk_disable(fbi->clk); > clk_put(fbi->clk); > > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965672Ab2B1PzZ (ORCPT ); Tue, 28 Feb 2012 10:55:25 -0500 Received: from mailout-de.gmx.net ([213.165.64.22]:55711 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S965643Ab2B1PzX (ORCPT ); Tue, 28 Feb 2012 10:55:23 -0500 X-Authenticated: #10250065 X-Provags-ID: V01U2FsdGVkX1+LvjE/E5GLxu1OJjbL0sKUrhd+6uuV2tF4GP/bb+ h5DhyiqoLXvlWm Message-ID: <4F4CF8D3.2090007@gmx.de> Date: Tue, 28 Feb 2012 15:54:59 +0000 From: Florian Tobias Schandinat User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20120207 Icedove/3.0.11 MIME-Version: 1.0 To: Julia Lawall CC: kernel-janitors@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drivers/video/pxa168fb.c: use devm_ functions References: <1329589169-18235-1-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1329589169-18235-1-git-send-email-Julia.Lawall@lip6.fr> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/18/2012 06:19 PM, Julia Lawall wrote: > From: Julia Lawall > > The various devm_ functions allocate memory that is released when a driver > detaches. This patch uses these functions for data that is allocated in > the probe function of a platform device and is only freed in the remove > function. > > By using devm_ioremap, it also removes a potential memory leak, because > there was no call to iounmap in the probe function. > > Signed-off-by: Julia Lawall Applied. Thanks, Florian Tobias Schandinat > > --- > drivers/video/pxa168fb.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c > index 8384b94..f146089 100644 > --- a/drivers/video/pxa168fb.c > +++ b/drivers/video/pxa168fb.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -670,7 +671,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > /* > * Map LCD controller registers. > */ > - fbi->reg_base = ioremap_nocache(res->start, resource_size(res)); > + fbi->reg_base = devm_ioremap_nocache(&pdev->dev, res->start, > + resource_size(res)); > if (fbi->reg_base == NULL) { > ret = -ENOMEM; > goto failed_free_info; > @@ -739,8 +741,8 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > /* > * Register irq handler. > */ > - ret = request_irq(irq, pxa168fb_handle_irq, IRQF_SHARED, > - info->fix.id, fbi); > + ret = devm_request_irq(&pdev->dev, irq, pxa168fb_handle_irq, > + IRQF_SHARED, info->fix.id, fbi); > if (ret < 0) { > dev_err(&pdev->dev, "unable to request IRQ\n"); > ret = -ENXIO; > @@ -759,14 +761,12 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev) > if (ret < 0) { > dev_err(&pdev->dev, "Failed to register pxa168-fb: %d\n", ret); > ret = -ENXIO; > - goto failed_free_irq; > + goto failed_free_cmap; > } > > platform_set_drvdata(pdev, fbi); > return 0; > > -failed_free_irq: > - free_irq(irq, fbi); > failed_free_cmap: > fb_dealloc_cmap(&info->cmap); > failed_free_clk: > @@ -808,13 +808,10 @@ static int __devexit pxa168fb_remove(struct platform_device *pdev) > fb_dealloc_cmap(&info->cmap); > > irq = platform_get_irq(pdev, 0); > - free_irq(irq, fbi); > > dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len), > info->screen_base, info->fix.smem_start); > > - iounmap(fbi->reg_base); > - > clk_disable(fbi->clk); > clk_put(fbi->clk); > > >