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: 12297 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 10FB91D5170 for ; Wed, 17 Oct 2012 11:16:37 +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 A4BD2A1822A for ; Wed, 17 Oct 2012 11:16:36 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11154661iej.11 for ; Wed, 17 Oct 2012 04:16:36 -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=609QOi7RtuhncXdTQyCjDp04bgEPQyMTVU1wzIAC0sU=; b=MqyWdVUm+cQI/KvpAjenVX84NhuldBJbUeetSchVlMU0/NFYZn6DF7zdQ5a2tLACwb rIxTK19h5pNxMTGd7lP+a/iXgKlHaCQ4IvQ2z2hJVyK8EA9TIAtOYyq6rD5RP01dQb1/ xBctYh9HCJBivGuJgaURbJdeyLpRv/KNQvkDpZ4D5lfht0y6rcnPo2otYDNkyPVMpHn3 msZw6Uqf0oD4QDkbX/BChFgQ6kf2YzSpgSNaKSvI94c8wy6UlKGCOc33hW3WIByirnLl 1oZR5nBfAN6XaUlnYJg3lZ8Dp5pVG5upeFfMFYaxywZ6eZ1W87bdSQqO0n0YU21fTyaJ AoCw== Received: by 10.50.100.137 with SMTP id ey9mr1146775igb.57.1350472595923; Wed, 17 Oct 2012 04:16:35 -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 n20csp878425igt; Wed, 17 Oct 2012 04:16:35 -0700 (PDT) Received: by 10.68.231.67 with SMTP id te3mr55853790pbc.134.1350472595294; Wed, 17 Oct 2012 04:16:35 -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 vz2si30778301pbc.33.2012.10.17.04.16.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 04:16:35 -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 md4so7863362pbc.37 for ; Wed, 17 Oct 2012 04:16:35 -0700 (PDT) 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: ALoCoQml1yKkqw+Nd9O8zfrGeSnbt/RSFydVpbY4UJmAIy/rTyZFnViSwYL09glp9x5VoQvbDJ1m 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);