Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553Ab2HMT5p (ORCPT ); Mon, 13 Aug 2012 15:57:45 -0400 Received: from mail1-relais-roc.national.inria.fr ([192.134.164.82]:42445 "EHLO mail1-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751558Ab2HMT5o (ORCPT ); Mon, 13 Aug 2012 15:57:44 -0400 X-IronPort-AV: E=Sophos;i="4.77,761,1336341600"; d="scan'208";a="169804347" Date: Mon, 13 Aug 2012 21:57:40 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@localhost6.localdomain6 To: Mauro Carvalho Chehab cc: Julia Lawall , Lars-Peter Clausen , Dan Carpenter , Mauro Carvalho Chehab , kernel-janitors@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drivers/media/video/mx2_emmaprp.c: use devm_kzalloc and devm_clk_get In-Reply-To: <50295A43.30305@redhat.com> Message-ID: References: <1344104607-18805-1-git-send-email-Julia.Lawall@lip6.fr> <20120806142323.GO4352@mwanda> <20120806142650.GT4403@mwanda> <501FD69D.7070702@metafoo.de> <50295A43.30305@redhat.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4220 Lines: 132 On Mon, 13 Aug 2012, Mauro Carvalho Chehab wrote: > Em 10-08-2012 10:59, Julia Lawall escreveu: >> From: Julia Lawall >> >> Using devm_kzalloc and devm_clk_get simplifies the code and ensures that >> the use of devm_request_irq is safe. When kzalloc and kfree were used, the >> interrupt could be triggered after the handler's data argument had been >> freed. >> >> Add missing return code initializations in the error handling code for >> devm_request_and_ioremap and devm_request_irq. >> >> The problem of a free after a devm_request_irq was found using the >> following semantic match (http://coccinelle.lip6.fr/) > > Hi Julia, > > This patch doesn't apply anymore, likely due to this changeset: OK, I'll fix it. Indeed, devm_clk_get is already introduced by this patch. julia > commit 33eb46a7c2bdd10f9a761390ce1bf51169ff537a > Author: Javier Martin > Date: Mon Jul 30 04:37:30 2012 -0300 > > [media] media: i.MX27: Fix mx2_emmaprp mem2mem driver clocks > > This driver wasn't converted to the new clock framework > (e038ed50a4a767add205094c035b6943e7b30140). > > Signed-off-by: Javier Martin > Signed-off-by: Mauro Carvalho Chehab > > diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c > index 5f8a6f5..728cac3 100644 > --- a/drivers/media/video/mx2_emmaprp.c > +++ b/drivers/media/video/mx2_emmaprp.c > @@ -209,7 +209,7 @@ struct emmaprp_dev { > > int irq_emma; > void __iomem *base_emma; > - struct clk *clk_emma; > + struct clk *clk_emma_ahb, *clk_emma_ipg; > struct resource *res_emma; > > struct v4l2_m2m_dev *m2m_dev; > @@ -804,7 +804,8 @@ static int emmaprp_open(struct file *file) > return ret; > } > > - clk_enable(pcdev->clk_emma); > + clk_prepare_enable(pcdev->clk_emma_ipg); > + clk_prepare_enable(pcdev->clk_emma_ahb); > ctx->q_data[V4L2_M2M_SRC].fmt = &formats[1]; > ctx->q_data[V4L2_M2M_DST].fmt = &formats[0]; > > @@ -820,7 +821,8 @@ static int emmaprp_release(struct file *file) > > dprintk(pcdev, "Releasing instance %p\n", ctx); > > - clk_disable(pcdev->clk_emma); > + clk_disable_unprepare(pcdev->clk_emma_ahb); > + clk_disable_unprepare(pcdev->clk_emma_ipg); > v4l2_m2m_ctx_release(ctx->m2m_ctx); > kfree(ctx); > > @@ -880,9 +882,15 @@ static int emmaprp_probe(struct platform_device *pdev) > > spin_lock_init(&pcdev->irqlock); > > - pcdev->clk_emma = clk_get(&pdev->dev, NULL); > - if (IS_ERR(pcdev->clk_emma)) { > - ret = PTR_ERR(pcdev->clk_emma); > + pcdev->clk_emma_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(pcdev->clk_emma_ipg)) { > + ret = PTR_ERR(pcdev->clk_emma_ipg); > + goto free_dev; > + } > + > + pcdev->clk_emma_ahb = devm_clk_get(&pdev->dev, "ahb"); > + if (IS_ERR(pcdev->clk_emma_ipg)) { > + ret = PTR_ERR(pcdev->clk_emma_ahb); > goto free_dev; > } > > @@ -891,12 +899,12 @@ static int emmaprp_probe(struct platform_device *pdev) > if (irq_emma < 0 || res_emma == NULL) { > dev_err(&pdev->dev, "Missing platform resources data\n"); > ret = -ENODEV; > - goto free_clk; > + goto free_dev; > } > > ret = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev); > if (ret) > - goto free_clk; > + goto free_dev; > > mutex_init(&pcdev->dev_mutex); > > @@ -969,8 +977,6 @@ rel_vdev: > video_device_release(vfd); > unreg_dev: > v4l2_device_unregister(&pcdev->v4l2_dev); > -free_clk: > - clk_put(pcdev->clk_emma); > free_dev: > kfree(pcdev); > > @@ -987,7 +993,6 @@ static int emmaprp_remove(struct platform_device *pdev) > v4l2_m2m_release(pcdev->m2m_dev); > vb2_dma_contig_cleanup_ctx(pcdev->alloc_ctx); > v4l2_device_unregister(&pcdev->v4l2_dev); > - clk_put(pcdev->clk_emma); > kfree(pcdev); > > return 0; > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/