From patchwork Mon Nov 26 04:17:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13185 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 2C1AF23FC0 for ; Mon, 26 Nov 2012 04:23:44 +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 CC425A192EA for ; Mon, 26 Nov 2012 04:23:43 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so4012769ieb.11 for ; Sun, 25 Nov 2012 20:23:43 -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:x-gm-message-state; bh=wxRWi40vYp3ciINbVCdO65yPyACfEhgOSUhSbHXqCRo=; b=P5IU4ftJXuRltUavkPmdCDwdo/6sKYs096z/8h9QMM4AyLax4YKl4L/sA7tJxL4xXg EgvEV3/HpJGbV0GGQtCQ3KFJiGu3Kk6VFHr09dmORlmQWnEhW1oNv+OMQ9CUMWsR1QiB rr30jDXp5OVKb9pztAhyzQL+hWyiVTeEt7GspziQW5eylmvrYDU6oyjYo8laeDWnxwkY ljDSrvzh1w+U+XpJ+zECp1ZXxeKct6APxT9tIyCgnb/amoZvGXwmz3v2MPkYnBeipElb m7C1WmdnxNXPitImN81BhNsy1i27BgdF0blpKoonTEIH6FLpMbYn63qaq/vyfmlvnk0U s62w== Received: by 10.50.187.197 with SMTP id fu5mr9683436igc.70.1353903823287; Sun, 25 Nov 2012 20:23:43 -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 n20csp198277igt; Sun, 25 Nov 2012 20:23:42 -0800 (PST) Received: by 10.66.77.201 with SMTP id u9mr29547391paw.6.1353903822600; Sun, 25 Nov 2012 20:23:42 -0800 (PST) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id uq10si17828478pbc.347.2012.11.25.20.23.42 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Nov 2012 20:23:42 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.50 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-f50.google.com with SMTP id hz10so5550240pad.9 for ; Sun, 25 Nov 2012 20:23:42 -0800 (PST) Received: by 10.68.238.199 with SMTP id vm7mr33481127pbc.105.1353903821958; Sun, 25 Nov 2012 20:23:41 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id yi9sm8047421pbc.39.2012.11.25.20.23.38 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Nov 2012 20:23:41 -0800 (PST) From: Sachin Kamat 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 Date: Mon, 26 Nov 2012 09:47:14 +0530 Message-Id: <1353903434-12682-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlCTrClXb3/ZbNUeaQ0yr/+6gHHLLLiXyiJ8iw58mdz+9HAYj3kOQ7FE5qbDDjXDygkH+BZ 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; }