From patchwork Fri Nov 23 11:50:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13145 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 3791B23DFE for ; Fri, 23 Nov 2012 11:57:10 +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 DC649A18815 for ; Fri, 23 Nov 2012 11:57:09 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so1705179ieb.11 for ; Fri, 23 Nov 2012 03:57:09 -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=MSCngHN6MB5dLAUY/9XAKnKbAmQAiZN9ExuqpZSVk70=; b=ENXH9B8zLkMVoOdzAJ6XNijGcTHMFVqM+3WzBxoaTNIgrXn3JLnE0AhIGzSxrRw3HY /tbdF356Lfc2shkiXYWnBFdDBEVFwPWa42AmMteRIXIA666lh+djBYahf/gnEuEW6QG2 MCOHgSBzUAtxtsQq/zyo9d6t8QYeU2aj3o/WWm1TQWSmo0UdT/m0A2g1Knh71vMFfSPN pQBrEeIn5N8rzolrIHfzqv4ADjuWL9A8oUCTQg10yDZ3cvjjM7IOL6xsF79I52JVBh/w PbDwVeF6O3umioLPASeyOWH5IJ5x7Tv2RsuRawYDUBwrU0KWDxF6y0db5fPCfr68uDRe UsoA== Received: by 10.50.161.169 with SMTP id xt9mr5791146igb.62.1353671829682; Fri, 23 Nov 2012 03:57:09 -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 n20csp341262igt; Fri, 23 Nov 2012 03:57:09 -0800 (PST) Received: by 10.66.79.133 with SMTP id j5mr9734678pax.51.1353671828841; Fri, 23 Nov 2012 03:57:08 -0800 (PST) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by mx.google.com with ESMTPS id vy7si8304185pbc.36.2012.11.23.03.57.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 03:57:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.49 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.49; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.49 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-f49.google.com with SMTP id bi1so3999610pad.22 for ; Fri, 23 Nov 2012 03:57:08 -0800 (PST) Received: by 10.66.84.40 with SMTP id v8mr9792657pay.47.1353671828590; Fri, 23 Nov 2012 03:57:08 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id zv10sm3718784pbc.76.2012.11.23.03.57.06 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 03:57:08 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 3/6] [media] s5p-fimc: Use devm_clk_get in fimc-lite.c Date: Fri, 23 Nov 2012 17:20:40 +0530 Message-Id: <1353671443-2978-4-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353671443-2978-1-git-send-email-sachin.kamat@linaro.org> References: <1353671443-2978-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQkqAlAn0tU6mB16RanSRw/mOITAi/teRQ/5QUFSv7+5lv0Wjq9nbsvqDqrddUcKkQxq6x+J devm_clk_get is device managed and makes error handling and cleanup a bit simpler. Signed-off-by: Sachin Kamat --- drivers/media/platform/s5p-fimc/fimc-lite.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c index 70bcf39..02d0ff9 100644 --- a/drivers/media/platform/s5p-fimc/fimc-lite.c +++ b/drivers/media/platform/s5p-fimc/fimc-lite.c @@ -1382,23 +1382,17 @@ static void fimc_lite_clk_put(struct fimc_lite *fimc) return; clk_unprepare(fimc->clock); - clk_put(fimc->clock); - fimc->clock = NULL; } static int fimc_lite_clk_get(struct fimc_lite *fimc) { int ret; - fimc->clock = clk_get(&fimc->pdev->dev, FLITE_CLK_NAME); + fimc->clock = devm_clk_get(&fimc->pdev->dev, FLITE_CLK_NAME); if (IS_ERR(fimc->clock)) return PTR_ERR(fimc->clock); ret = clk_prepare(fimc->clock); - if (ret < 0) { - clk_put(fimc->clock); - fimc->clock = NULL; - } return ret; }