From patchwork Fri May 25 23:14:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 161435 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 3D732B6EF1 for ; Sat, 26 May 2012 09:15:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758770Ab2EYXPM (ORCPT ); Fri, 25 May 2012 19:15:12 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:47450 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758387Ab2EYXPL (ORCPT ); Fri, 25 May 2012 19:15:11 -0400 Received: by vcbf11 with SMTP id f11so727674vcb.19 for ; Fri, 25 May 2012 16:15:11 -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; bh=/OVtpgPcjYP4CtOG+NJ1RTCCVBvhtQ5PoAn2rUsShZg=; b=Hv4KYSY39zVB7w7MrIA3/MEO/FzIGZUgcDSZErjU+mChyDeffrRHCTkurAMF8qQGLZ LUPfHepd/ruuCvl8jfvUD+92xSkhZdH8IlUvZsda3UpdiELRJKSj+LG2k5Z1BbMwhiav +VeUrfclwOgtBmfwt9ApaoCEO6dM5YaEw84FmOBDz+EPAK3V98/A3pjIF6NBrPeI0HOE S657UqIbu1/zw2KC+DkCTwxdiCUEHPgrQZfipyYe97bpOHGFxzW/+ydOkvsXmOdr/p5u 9FtdyViyKGAbq3PVOhsE+wOhS/od6kbJSdmtjdD33gtQDH9HFi2y6kwMoxvjO0fvAvJL f+Ww== Received: by 10.220.210.20 with SMTP id gi20mr665568vcb.42.1337987710796; Fri, 25 May 2012 16:15:10 -0700 (PDT) Received: from localhost.localdomain ([201.82.161.72]) by mx.google.com with ESMTPS id s10sm2787583vdg.10.2012.05.25.16.15.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 May 2012 16:15:10 -0700 (PDT) From: Fabio Estevam To: kernel@pengutronix.de Cc: shawn.guo@freescale.com, Fabio Estevam , Jeff Garzik , Subject: [PATCH 02/15] ata: Use clk_prepare_enable/clk_disable_unprepare Date: Fri, 25 May 2012 20:14:43 -0300 Message-Id: <1337987696-31728-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1337987696-31728-1-git-send-email-festevam@gmail.com> References: <1337987696-31728-1-git-send-email-festevam@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Fabio Estevam Prepare the clock before enabling it. Cc: Jeff Garzik Cc: Signed-off-by: Fabio Estevam Acked-by: Sascha Hauer --- drivers/ata/pata_imx.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c index c5af97f..87bb05b 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c @@ -118,7 +118,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev) return PTR_ERR(priv->clk); } - clk_enable(priv->clk); + clk_prepare_enable(priv->clk); host = ata_host_alloc(&pdev->dev, 1); if (!host) @@ -162,7 +162,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev) &pata_imx_sht); free_priv: - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); clk_put(priv->clk); return -ENOMEM; } @@ -176,7 +176,7 @@ static int __devexit pata_imx_remove(struct platform_device *pdev) __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); clk_put(priv->clk); return 0; @@ -194,7 +194,7 @@ static int pata_imx_suspend(struct device *dev) __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); priv->ata_ctl = __raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL); - clk_disable(priv->clk); + clk_disable_unprepare(priv->clk); } return ret; @@ -205,7 +205,7 @@ static int pata_imx_resume(struct device *dev) struct ata_host *host = dev_get_drvdata(dev); struct pata_imx_priv *priv = host->private_data; - clk_enable(priv->clk); + clk_prepare_enable(priv->clk); __raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL);