From patchwork Wed Oct 17 11:11:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 1605001 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1E01EDFABE for ; Wed, 17 Oct 2012 11:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755271Ab2JQLQg (ORCPT ); Wed, 17 Oct 2012 07:16:36 -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 S1754602Ab2JQLQf (ORCPT ); Wed, 17 Oct 2012 07:16:35 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so6997024pad.19 for ; Wed, 17 Oct 2012 04:16:35 -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=609QOi7RtuhncXdTQyCjDp04bgEPQyMTVU1wzIAC0sU=; b=ZuUcya/OWTEBETLxdBf6aQ0tILsXWfqlTPOfTPirHatGwsUYynSpuaLONup3s98ayR 3o/xdLLyH4faY8H8DQTxoGfVpYnfkFeRzW1eeBdIsAuICxmJGaxn5IVTTAoAqasnZwkz 5MeCL62o6sCnknD2Pw9qrPV1elC9cLSxGG6WkWdrQyAZVUvnSepsU6jL7JpIGGQOa1Ia N9typ9AQ3uOaNvNndBjbFKZYpZQemDEk/WdOt5+rj3ELN6/7N6xndmippccsuQPYOL4Q U/ZB2TMXCbxlcrP89pYjfoCg8rXFHL0saongkgIoekeVM0r7Mdo0o7eZVgDKTGqBFPGx dJDA== Received: by 10.68.235.71 with SMTP id uk7mr55822595pbc.10.1350472595040; Wed, 17 Oct 2012 04:16:35 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id vu7sm12365003pbc.9.2012.10.17.04.16.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:34 -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 2/8] [media] s5p-g2d: Use clk_prepare_enable and clk_disable_unprepare Date: Wed, 17 Oct 2012 16:41:45 +0530 Message-Id: <1350472311-9748-2-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: ALoCoQlfbTyBWF6mVObUkx54watLWuqFfe0FqFGwCsC5t2TBOMJMp2bTRvBekFRZ31vn6TGlE7F8 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-g2d/g2d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 1bfbc32..adecd25 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -589,7 +589,7 @@ static void device_run(void *prv) src = v4l2_m2m_next_src_buf(ctx->m2m_ctx); dst = v4l2_m2m_next_dst_buf(ctx->m2m_ctx); - clk_enable(dev->gate); + clk_prepare_enable(dev->gate); g2d_reset(dev); spin_lock_irqsave(&dev->ctrl_lock, flags); @@ -619,7 +619,7 @@ static irqreturn_t g2d_isr(int irq, void *prv) struct vb2_buffer *src, *dst; g2d_clear_int(dev); - clk_disable(dev->gate); + clk_disable_unprepare(dev->gate); BUG_ON(ctx == NULL);