From patchwork Wed Oct 17 11:11:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 12298 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 6E2881D5170 for ; Wed, 17 Oct 2012 11:16:39 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 144E4A1822A for ; Wed, 17 Oct 2012 11:16:38 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so5203519iag.11 for ; Wed, 17 Oct 2012 04:16:38 -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=9D/vzvdvWlEN88wvgI3wsYzR/RA0Tva69le5VJFRwK0=; b=HIboRyDT6wiUnrVB6UqiU6E6isbfSglFt9bppl1SIjPtJ7RWcVAYzi1bexLzJBU+LB 2KjXW7Gd/dEXr1584H7bluoRR/V9OA0/6WToonyeuUFsKHYxvkL6Bpp14oRzzugClsFt KWLq4ZrylHclUoT6G3whTr8qr+GmogIxEvqd9mp9rWmuv8q7STwiXH+TwCtpCOtV9Ij/ LXoWGF0YY/Lwm7nbKL4MHIps9iUo9kZ/UOQyBFkzrFI902+z2crxX820ZFafQlIz76w2 YkeIRNDiG1VUp71r8e9E0WoxyLZkKYyVhsMOyEVK/3/mc09J/2XDtVFIIWnTwmyDayXa 7EOw== Received: by 10.50.236.72 with SMTP id us8mr1127004igc.70.1350472598843; Wed, 17 Oct 2012 04:16:38 -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 n20csp878433igt; Wed, 17 Oct 2012 04:16:38 -0700 (PDT) Received: by 10.68.136.98 with SMTP id pz2mr33933199pbb.2.1350472598129; Wed, 17 Oct 2012 04:16:38 -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.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:38 -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:37 -0700 (PDT) Received: by 10.66.86.3 with SMTP id l3mr24237433paz.55.1350472597909; Wed, 17 Oct 2012 04:16:37 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id vu7sm12365003pbc.9.2012.10.17.04.16.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:37 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, sachin.kamat@linaro.org, patches@linaro.org, Kamil Debski Subject: [PATCH 3/8] [media] s5p-mfc: Use clk_prepare_enable and clk_disable_unprepare Date: Wed, 17 Oct 2012 16:41:46 +0530 Message-Id: <1350472311-9748-3-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: ALoCoQnbOv1ZkHEaZjFaMAnHmL895YAKFdUEhjQtpyNYLFltRftNR8SwmwIdezaxOEf3kSIPY7gv Replace clk_enable/clk_disable with clk_prepare_enable/clk_disable_unprepare as required by the common clock framework. Signed-off-by: Sachin Kamat Cc: Kamil Debski --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 367db75..f7c5c5a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -100,7 +100,7 @@ int s5p_mfc_clock_on(void) atomic_inc(&clk_ref); mfc_debug(3, "+ %d", atomic_read(&clk_ref)); #endif - ret = clk_enable(pm->clock_gate); + ret = clk_prepare_enable(pm->clock_gate); return ret; } @@ -110,7 +110,7 @@ void s5p_mfc_clock_off(void) atomic_dec(&clk_ref); mfc_debug(3, "- %d", atomic_read(&clk_ref)); #endif - clk_disable(pm->clock_gate); + clk_disable_unprepare(pm->clock_gate); } int s5p_mfc_power_on(void)