From patchwork Fri Nov 23 10:06:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13137 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 BF5C823E13 for ; Fri, 23 Nov 2012 10:12:32 +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 5EB51A189C4 for ; Fri, 23 Nov 2012 10:12:32 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1603403ieb.11 for ; Fri, 23 Nov 2012 02:12:31 -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=eduaXq2jm/nS/9kV1ZP13f3Punz9LlG8xJpOZ6BFhMk=; b=P+NG6G98nWANKyQipUJsCIZwSzG0XrKhBzvc9GrSFdfCdw2/yLlc7UYPPr6uMPXlbe RAb136LuBs2Xgk0qHPgztSvUUJG1V1VHZgh25W8anhtYiGIJ+lywBdrds5EK55HFT/dD fR7bzSMCLnDAT6trTD/8Iuane02oif2TfmrNsV1RWWtIm6k0agNbcmdGA4Lpfm9LSYXm phtAza1QxpDrQ1GosU+iOuJr3EW+8xbVU50PE4gicmEjBRiMPvtFnXRmPHVSReD+vkr0 Jhqexv7rz6/kvDFFTITgH1mSs993fQjT+0FQUougWCcSQ3BEOKIKLII3dXZEaLCrVAIJ fPqA== Received: by 10.50.213.34 with SMTP id np2mr3036730igc.57.1353665551796; Fri, 23 Nov 2012 02:12:31 -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 n20csp329880igt; Fri, 23 Nov 2012 02:12:31 -0800 (PST) Received: by 10.68.241.232 with SMTP id wl8mr12737500pbc.144.1353665551126; Fri, 23 Nov 2012 02:12:31 -0800 (PST) Received: from mail-da0-f42.google.com (mail-da0-f42.google.com [209.85.210.42]) by mx.google.com with ESMTPS id t9si7624566paz.142.2012.11.23.02.12.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 02:12:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.42 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.210.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.42 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-da0-f42.google.com with SMTP id z17so5974295dal.1 for ; Fri, 23 Nov 2012 02:12:30 -0800 (PST) Received: by 10.66.84.40 with SMTP id v8mr9144686pay.47.1353665550772; Fri, 23 Nov 2012 02:12:30 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id kc4sm3604933pbc.23.2012.11.23.02.12.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 02:12:30 -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 1/1] drm/exynos: remove unnecessary clk_disable calls in exynos_drm_fimd.c Date: Fri, 23 Nov 2012 15:36:12 +0530 Message-Id: <1353665172-6754-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQnLfuqo475x3DuPX212tEP9nYTVYXCR3kW5eIghypXslr25lvx9mBknabM7SZHtb9RTbAo1 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 | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 57851cc..00bd266 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -849,15 +849,13 @@ static int __devinit fimd_probe(struct platform_device *pdev) 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 = 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,15 +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); - -err_bus_clk: - clk_disable(ctx->bus_clk); - -err_clk_get: - return ret; } static int __devexit fimd_remove(struct platform_device *pdev)