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: 12300 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 DB85F1D5170 for ; Wed, 17 Oct 2012 11:16: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 857E3A184D5 for ; Wed, 17 Oct 2012 11:16:44 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11154661iej.11 for ; Wed, 17 Oct 2012 04:16:44 -0700 (PDT) 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=Yzobj+eLlWKlh0sCQszrNy+Y2PXijGfXOMthUFTrBjs=; b=jgwTt3CBaDhI9LdFcfXhYnMU0aIQWOFbPoSBqMgtxzH+K0sHF1OYx+EN3WSQ4R+ZCd dykETg/nhasKvzrn5yvb4qt5jI4/jw6ozQS6XM6CyZ1y0Ud0foGfjPNgQFt7aPfzNObe NhNdn78QcH6Ii/kUix4kWH2xDHUwTOMzH1ZpF515uh8fV3T2A388/7IPjvgWIrK11xsv TrZ/l1WJna6fd9xcF3UpxRwqppmPjDbBqcEDrXrE6XNubcm/u/Be7U5so5qfTNL/p86K KaxhQ25n5JvWsM45djiE7wbv9tbvaXXMmYLFXgKf1CTuOv3N2vCbLw5umir/wTRA5sr6 amLw== Received: by 10.50.46.226 with SMTP id y2mr1127774igm.62.1350472604314; Wed, 17 Oct 2012 04:16:44 -0700 (PDT) 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 n20csp878448igt; Wed, 17 Oct 2012 04:16:43 -0700 (PDT) Received: by 10.66.73.6 with SMTP id h6mr49692483pav.69.1350472603782; Wed, 17 Oct 2012 04:16:43 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id bf10si30307167pab.311.2012.10.17.04.16.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.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-pb0-f50.google.com with SMTP id md4so7863361pbc.37 for ; Wed, 17 Oct 2012 04:16:43 -0700 (PDT) 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: ALoCoQm73/Yn98B2+YcbEoWyG4cl7URCYIpHYNvWBS9KJ1jL784VABWt83aexFQlJsmpX3X5GFxF 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;