Patchwork [02/15] ata: Use clk_prepare_enable/clk_disable_unprepare

login
register
mail settings
Submitter Fabio Estevam
Date May 25, 2012, 11:14 p.m.
Message ID <1337987696-31728-2-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/161435/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Fabio Estevam - May 25, 2012, 11:14 p.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

Prepare the clock before enabling it.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: <linux-ide@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/ata/pata_imx.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Sascha Hauer - May 29, 2012, 9:17 a.m.
On Fri, May 25, 2012 at 08:14:43PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Prepare the clock before enabling it.
> 
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: <linux-ide@vger.kernel.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>


> ---
>  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);
>  
> -- 
> 1.7.1
> 
>
Fabio Estevam - June 6, 2012, 3:40 a.m.
Jeff,

On Tue, May 29, 2012 at 6:17 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Fri, May 25, 2012 at 08:14:43PM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> Prepare the clock before enabling it.
>>
>> Cc: Jeff Garzik <jgarzik@pobox.com>
>> Cc: <linux-ide@vger.kernel.org>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Can this be applied?
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - June 8, 2012, 3:49 p.m.
On 06/05/2012 11:40 PM, Fabio Estevam wrote:
> Jeff,
>
> On Tue, May 29, 2012 at 6:17 AM, Sascha Hauer<s.hauer@pengutronix.de>  wrote:
>> On Fri, May 25, 2012 at 08:14:43PM -0300, Fabio Estevam wrote:
>>> From: Fabio Estevam<fabio.estevam@freescale.com>
>>>
>>> Prepare the clock before enabling it.
>>>
>>> Cc: Jeff Garzik<jgarzik@pobox.com>
>>> Cc:<linux-ide@vger.kernel.org>
>>> Signed-off-by: Fabio Estevam<fabio.estevam@freescale.com>
>>
>> Acked-by: Sascha Hauer<s.hauer@pengutronix.de>
>
> Can this be applied?

Just got back from Europe, and will get this in ASAP...



--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);