From patchwork Fri Nov 23 11:04:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 15595 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TbrAN-0004q2-MV for patchwork@linuxtv.org; Fri, 23 Nov 2012 12:11:27 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1TbrAN-0005Dz-A1; Fri, 23 Nov 2012 12:11:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755448Ab2KWLLW (ORCPT ); Fri, 23 Nov 2012 06:11:22 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:50490 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755839Ab2KWLLL (ORCPT ); Fri, 23 Nov 2012 06:11:11 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so3478794pad.19 for ; Fri, 23 Nov 2012 03:11:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=L/MN43TQWr9Fg2FJAHeIb0uGLYtIEsusXIkLNGT2SJc=; b=htV8AvAceyQITHGRSAZ9TbO6T5WB4CeNRDO6OLoZvUJnQwZK9IvIka7DELPXwH9bxk s7qeRSMieW77gBolXc0qEyoiB0RyN0VnR8aViEjpHS+xCInHdOHCXElk/jbQZLu6hcTW rZXq2l4HCt1T+QHQSMCnv07IDh1/uMuR6mpY9oukoXaW4QOqEMFrvCt2Gr2peDBySxpr YTCTK3vHPNAdDrz/pT7XK3bO0MknX61H+kSt7UbFRFlXdLLf10liTe8V/SgXEimW9Nul iB+eOO/cCbOL7nP0Tv1PBuJ2NeMDZzEL2PXUjY49/Zptadonw3WAKw8+0Z9j95G/XS3R Y0AQ== Received: by 10.66.86.101 with SMTP id o5mr9661491paz.15.1353669071210; Fri, 23 Nov 2012 03:11:11 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id wf8sm3667394pbc.65.2012.11.23.03.11.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 03:11:10 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org, Shaik Ameer Basha Subject: [PATCH v2 3/4] [media] exynos-gsc: Use devm_clk_get() Date: Fri, 23 Nov 2012 16:34:41 +0530 Message-Id: <1353668682-13366-4-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353668682-13366-1-git-send-email-sachin.kamat@linaro.org> References: <1353668682-13366-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQnVZydh3QSw6mz7CgRrU0rQiueysKo46nmQZmyCvJ8AQHZUO4Pjcrxk30rZQCn+9HS+hBBg Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.11.23.110031 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' devm_clk_get() is a device managed function and makes error handling a bit simpler. Cc: Shaik Ameer Basha Signed-off-by: Sachin Kamat --- drivers/media/platform/exynos-gsc/gsc-core.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index 99ee1a9..5a285b2 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1006,8 +1006,6 @@ static void gsc_clk_put(struct gsc_dev *gsc) return; clk_unprepare(gsc->clock); - clk_put(gsc->clock); - gsc->clock = NULL; } static int gsc_clk_get(struct gsc_dev *gsc) @@ -1016,26 +1014,21 @@ static int gsc_clk_get(struct gsc_dev *gsc) dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n"); - gsc->clock = clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME); + gsc->clock = devm_clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME); if (IS_ERR(gsc->clock)) { dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n", GSC_CLOCK_GATE_NAME); - goto err; + return PTR_ERR(gsc->clock); } ret = clk_prepare(gsc->clock); if (ret < 0) { dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n", GSC_CLOCK_GATE_NAME); - clk_put(gsc->clock); - gsc->clock = NULL; - goto err; + return ret; } return 0; - -err: - return -ENXIO; } static int gsc_m2m_suspend(struct gsc_dev *gsc)