From mboxrd@z Thu Jan 1 00:00:00 1970 From: Inki Dae Subject: RE: [PATCH Resend] drm/exynos: Use devm_clk_get in exynos_drm_fimd.c Date: Mon, 26 Nov 2012 14:59:42 +0900 Message-ID: <002601cdcb9b$3a855b40$af9011c0$%dae@samsung.com> References: <1353903434-12682-1-git-send-email-sachin.kamat@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F025E5EDB for ; Sun, 25 Nov 2012 21:59:45 -0800 (PST) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ME200BGXZ7SK8M0@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 26 Nov 2012 14:59:42 +0900 (KST) Received: from NOINKIDAE02 ([10.90.51.52]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0ME200094ZBINJ60@mmp2.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 26 Nov 2012 14:59:42 +0900 (KST) In-reply-to: <1353903434-12682-1-git-send-email-sachin.kamat@linaro.org> Content-language: ko List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: 'Sachin Kamat' , dri-devel@lists.freedesktop.org Cc: patches@linaro.org List-Id: dri-devel@lists.freedesktop.org Applied. Thanks, Inki Dae > -----Original Message----- > From: Sachin Kamat [mailto:sachin.kamat@linaro.org] > Sent: Monday, November 26, 2012 1:17 PM > To: dri-devel@lists.freedesktop.org > Cc: inki.dae@samsung.com; sachin.kamat@linaro.org; patches@linaro.org; > airlied@linux.ie > Subject: [PATCH Resend] drm/exynos: Use devm_clk_get in exynos_drm_fimd.c > > devm_clk_get is device managed and makes error handling and exit code > simpler. > Also fixes an error related to returning 'ret' without initialising > with error code. > > Signed-off-by: Sachin Kamat > --- > drivers/gpu/drm/exynos/exynos_drm_fimd.c | 31 ++++++-------------------- > --- > 1 files changed, 7 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > index ad04edd..00bd266 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > @@ -846,18 +846,16 @@ static int __devinit fimd_probe(struct > platform_device *pdev) > if (!ctx) > return -ENOMEM; > > - ctx->bus_clk = clk_get(dev, "fimd"); > + ctx->bus_clk = devm_clk_get(dev, "fimd"); > if (IS_ERR(ctx->bus_clk)) { > dev_err(dev, "failed to get bus clock\n"); > - ret = PTR_ERR(ctx->bus_clk); > - goto err_clk_get; > + return PTR_ERR(ctx->bus_clk); > } > > - ctx->lcd_clk = clk_get(dev, "sclk_fimd"); > + ctx->lcd_clk = devm_clk_get(dev, "sclk_fimd"); > if (IS_ERR(ctx->lcd_clk)) { > dev_err(dev, "failed to get lcd clock\n"); > - ret = PTR_ERR(ctx->lcd_clk); > - goto err_bus_clk; > + return PTR_ERR(ctx->lcd_clk); > } > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > @@ -865,14 +863,13 @@ static int __devinit fimd_probe(struct > platform_device *pdev) > ctx->regs = devm_request_and_ioremap(&pdev->dev, res); > if (!ctx->regs) { > dev_err(dev, "failed to map registers\n"); > - ret = -ENXIO; > - goto err_clk; > + return -ENXIO; > } > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (!res) { > dev_err(dev, "irq request failed.\n"); > - goto err_clk; > + return -ENXIO; > } > > ctx->irq = res->start; > @@ -881,7 +878,7 @@ static int __devinit fimd_probe(struct platform_device > *pdev) > 0, "drm_fimd", ctx); > if (ret) { > dev_err(dev, "irq request failed.\n"); > - goto err_clk; > + return ret; > } > > ctx->vidcon0 = pdata->vidcon0; > @@ -915,17 +912,6 @@ static int __devinit fimd_probe(struct > platform_device *pdev) > exynos_drm_subdrv_register(subdrv); > > return 0; > - > -err_clk: > - clk_disable(ctx->lcd_clk); > - clk_put(ctx->lcd_clk); > - > -err_bus_clk: > - clk_disable(ctx->bus_clk); > - clk_put(ctx->bus_clk); > - > -err_clk_get: > - return ret; > } > > static int __devexit fimd_remove(struct platform_device *pdev) > @@ -949,9 +935,6 @@ static int __devexit fimd_remove(struct > platform_device *pdev) > out: > pm_runtime_disable(dev); > > - clk_put(ctx->lcd_clk); > - clk_put(ctx->bus_clk); > - > return 0; > } > > -- > 1.7.4.1