From patchwork Wed Oct 17 11:11:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 1605031 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 25ECB3FE36 for ; Wed, 17 Oct 2012 11:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756616Ab2JQLQq (ORCPT ); Wed, 17 Oct 2012 07:16:46 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:42343 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756530Ab2JQLQn (ORCPT ); Wed, 17 Oct 2012 07:16:43 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so6997024pad.19 for ; Wed, 17 Oct 2012 04:16:43 -0700 (PDT) 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=Yzobj+eLlWKlh0sCQszrNy+Y2PXijGfXOMthUFTrBjs=; b=b23ZQV+5OrnCzM0abCa7Z6KC8PEe4tIidW5RBurLKkGjmBezePvwldk+BudYztwcC1 rwXVC2hZ6Fya2knjitPokCa1k6EvdJ62Ej2wlIHSd3ZuFMa6c+9y0zn+xPjtvtE97j9Q /gkuPUzH7zhXQL7Zync5YpeBnMquROnIYf6WWlVS8EIlGppSOf0wdhGLE54y6V/TlFWD QnVVBGO75K7bzIArTg415Ft3tcBfz0ILh+wynd6GdF7gA8KaCGy9V+Z9Tn2oWUa0z+C9 GaPpICx7t62cLB2iLAPYN5TO/F3dPJ3JbE3xfm0n7G/fnrQ8fU4xQca1s7HzluPt2CSv glmg== Received: by 10.68.125.229 with SMTP id mt5mr30037923pbb.51.1350472603560; Wed, 17 Oct 2012 04:16:43 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id vu7sm12365003pbc.9.2012.10.17.04.16.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:43 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 5/8] [media] exynos-gsc: Use clk_prepare_enable and clk_disable_unprepare Date: Wed, 17 Oct 2012 16:41:48 +0530 Message-Id: <1350472311-9748-5-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1350472311-9748-1-git-send-email-sachin.kamat@linaro.org> References: <1350472311-9748-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQkF4LTI3ZhpD+h8srY3eouCfVvi8ArO0oLW3tiG6QVocYXVR/jvkH7sErGpCkKNfg0dKuHu Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Replace clk_enable/clk_disable with clk_prepare_enable/clk_disable_unprepare as required by the common clock framework. Signed-off-by: Sachin Kamat --- drivers/media/platform/exynos-gsc/gsc-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index bfec9e6..d11668b 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1009,7 +1009,7 @@ static int gsc_clk_get(struct gsc_dev *gsc) if (IS_ERR(gsc->clock)) goto err_print; - ret = clk_prepare(gsc->clock); + ret = clk_prepare_enable(gsc->clock); if (ret < 0) { clk_put(gsc->clock); gsc->clock = NULL; @@ -1186,7 +1186,7 @@ static int gsc_runtime_suspend(struct device *dev) ret = gsc_m2m_suspend(gsc); if (!ret) - clk_disable(gsc->clock); + clk_disable_unprepare(gsc->clock); pr_debug("gsc%d: state: 0x%lx", gsc->id, gsc->state); return ret;