From patchwork Fri Nov 23 08:43:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13134 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9764123FCD for ; Fri, 23 Nov 2012 08:49:56 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 492CEA1898C for ; Fri, 23 Nov 2012 08:49:56 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1529574ieb.11 for ; Fri, 23 Nov 2012 00:49:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Vw7yNTn2kXzL7IqcjpBauZmqe8WjrwNNWNRBCiEXQdg=; b=jMa9UgubeNIOn+lr689buWdYiJDVvebG8EJvLDmZCcrAJ4MTKIkLwhiAPlvwQ729La yw5xwOt5NRO19H6kd0UaCo3JEgJsqkbcLNHoCJ62XnArHNBIdE0b5GzsVROWnu2PwUbW ygmyZG9pve+y2yXBP6KYQQ3S5gAAiMUEtvT9492s/HfEv8Ze/UYO/EQBMXCv6ppEmIBE NwtjJfdHTlGsFNfsMnK7StapJTWLvvwL6lQgLL5pS++0PakaR7fPdFo3ROqpPp/DxX0f gIpi8lG9wchrcOd9CWYuHDvW2cfsRDyJ/yY+/PoCVV9B4bJkai6Hzn/BP7H22KoWXxKb QP2Q== Received: by 10.43.46.2 with SMTP id um2mr2581771icb.18.1353660596044; Fri, 23 Nov 2012 00:49:56 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp320778igt; Fri, 23 Nov 2012 00:49:55 -0800 (PST) Received: by 10.68.248.1 with SMTP id yi1mr12549446pbc.93.1353660595510; Fri, 23 Nov 2012 00:49:55 -0800 (PST) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by mx.google.com with ESMTPS id o4si7491228paw.25.2012.11.23.00.49.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 00:49:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.54 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.54; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.54 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pa0-f54.google.com with SMTP id bi5so971066pad.27 for ; Fri, 23 Nov 2012 00:49:55 -0800 (PST) Received: by 10.66.85.134 with SMTP id h6mr8675984paz.36.1353660595175; Fri, 23 Nov 2012 00:49:55 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id kc4sm3496959pbc.23.2012.11.23.00.49.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 00:49:54 -0800 (PST) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Cc: inki.dae@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH Resend] drm/exynos: Use devm_clk_get in exynos_drm_fimd.c Date: Fri, 23 Nov 2012 14:13:28 +0530 Message-Id: <1353660208-9776-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353660208-9776-1-git-send-email-sachin.kamat@linaro.org> References: <1353660208-9776-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQkLrk2m/EtaRbTXwDIj+mnEMmh+VsfKf+GUXqYwLwSGQG1cDfDE6P22Xo1THiIIOkzClh8v devm_clk_get is device managed and makes error handling and exit code simpler. 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; }