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: 1605011 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 782B43FE36 for ; Wed, 17 Oct 2012 11:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755707Ab2JQLQj (ORCPT ); Wed, 17 Oct 2012 07:16:39 -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 S1755530Ab2JQLQi (ORCPT ); Wed, 17 Oct 2012 07:16:38 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so6997024pad.19 for ; Wed, 17 Oct 2012 04:16:37 -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=9D/vzvdvWlEN88wvgI3wsYzR/RA0Tva69le5VJFRwK0=; b=fzrSSVGORj5+naXJhDJBlv2vq8+Jgm11Qol9L4olHzXypKqTV7DNjSukfG+OyrQWIP M7XhL0MC2Us2DUozZNV4wHP+1czMuVvxTIJWxh2/KK0Fm95QplrpkoIrW8OJ6rl64IE7 X8Bd1V3olpXkXEWFs8RaPAL3tHaX6xgx+yDt2yWHYIlaccav11dkCnGVTNylcFwI7Ulk rjKG5sIXSOQ7QvTyw/stXSUtMwjZJGyylMSAh76+mCHdNOX6PGLPqdIat8DZurxBn1u+ o7omAEgePQH0L1ed9/kN65jxX4PS0y7VVHNQybdavivrVpSNSIlmK4ptZkohh04+nZDL ciAg== 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: ALoCoQl2z3o0ivhWvyWHdSepNTJaFNam3sh0Aveh2FDtJl0sUxYKjmdtKVKMN/UEcC8e4U+S1QMp 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 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)