From patchwork Sat Apr 21 12:10:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: viresh kumar X-Patchwork-Id: 154209 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B906DB6FA3 for ; Sat, 21 Apr 2012 22:11:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752498Ab2DUML3 (ORCPT ); Sat, 21 Apr 2012 08:11:29 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:33246 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725Ab2DUML2 (ORCPT ); Sat, 21 Apr 2012 08:11:28 -0400 Received: by pbcun15 with SMTP id un15so2061502pbc.19 for ; Sat, 21 Apr 2012 05:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=WJlESPfOEbjPJYTKCMcUelWHlKav6PfLen0cb7Jr69k=; b=uA/DwVys4NtA8CP8n41vHA5jVgAw5Q+XOAyzsko0hy2Wr/BltaAalkw0XZp6dIy+/f x6V750Zu3B2QS6xgVw3t3KdUS8uMGf0WSh87g8BwwtiVuCDKH+pKOc48HBGZ3f9JrZ0j wZsyXxajsplw1EIDIKIIiifAD8notBGkNccuBsLlTEPduXJMORzcd8KSXhvs8didt9t6 FGvdB+yjgg6UoJUONQmhATo+HTWoHfAhDWMKcKB0qHae4/3Nm4f5JgwjOgoazzGbr6Up JF8bMTNKXDhdbgwnsuFu+sKuUp7vhf5rkkVN/LGLsUgQ3oVd2QxvtFF1rnZ6KF37ltB3 qJ/A== Received: by 10.68.230.40 with SMTP id sv8mr20735453pbc.124.1335010288295; Sat, 21 Apr 2012 05:11:28 -0700 (PDT) Received: from localhost ([223.226.85.135]) by mx.google.com with ESMTPS id y3sm8292191pbh.59.2012.04.21.05.11.19 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Apr 2012 05:11:27 -0700 (PDT) From: Viresh Kumar To: jgarzik@redhat.com Cc: spear-devel@list.st.com, viresh.linux@gmail.com, linux-ide@vger.kernel.org, sshtylyov@mvista.com, Viresh Kumar Subject: [PATCH V2 2/5] ata: pata_arasan: Add clk_{un}prepare() support Date: Sat, 21 Apr 2012 17:40:10 +0530 Message-Id: <6b5d5180809bff6d85d4a75ce59b44a5894784e3.1335009631.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: References: In-Reply-To: References: Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org clk_{un}prepare is mandatory for platforms using common clock framework. Since this driver is used by SPEAr platform, which supports common clock framework, add clk_{un}prepare() support for it. Signed-off-by: Viresh Kumar --- drivers/ata/pata_arasan_cf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index 5ebf1cc..aa3b4d4 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -311,7 +311,7 @@ static int cf_init(struct arasan_cf_dev *acdev) int ret = 0; if (!IS_ERR(acdev->clk)) { - ret = clk_enable(acdev->clk); + ret = clk_prepare_enable(acdev->clk); if (ret) { dev_dbg(acdev->host->dev, "clock enable failed"); return ret; @@ -344,7 +344,7 @@ static void cf_exit(struct arasan_cf_dev *acdev) spin_unlock_irqrestore(&acdev->host->lock, flags); if (!IS_ERR(acdev->clk)) - clk_disable(acdev->clk); + clk_disable_unprepare(acdev->clk); } static void dma_callback(void *dev)