Re: [PATCH v3 5/7] spi: atmel: prepare clk before calling enable

[Mark Brown]

On Tue, Jul 16, 2013 at 05:16:22PM +0200, Boris BREZILLON wrote:
> Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
> avoid common clk framework warnings.

Applied, thanks.


signature.asc
Description: Digital signature

Re: [PATCH v3 5/7] spi: atmel: prepare clk before calling enable

[Mark Brown]

On Tue, Jul 16, 2013 at 05:16:22PM +0200, Boris BREZILLON wrote:
 Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
 avoid common clk framework warnings.

Applied, thanks.


signature.asc
Description: Digital signature

[PATCH v3 5/7] spi: atmel: prepare clk before calling enable

[Boris BREZILLON]

Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: Boris BREZILLON 
---
 drivers/spi/spi-atmel.c |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index ea1ec00..4c6c455 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1579,7 +1579,9 @@ static int atmel_spi_probe(struct platform_device *pdev)
goto out_unmap_regs;
 
/* Initialize the hardware */
-   clk_enable(clk);
+   ret = clk_prepare_enable(clk);
+   if (ret)
+   goto out_unmap_regs;
spi_writel(as, CR, SPI_BIT(SWRST));
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
if (as->caps.has_wdrbt) {
@@ -1609,7 +1611,7 @@ out_free_dma:
 
spi_writel(as, CR, SPI_BIT(SWRST));
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
-   clk_disable(clk);
+   clk_disable_unprepare(clk);
free_irq(irq, master);
 out_unmap_regs:
iounmap(as->regs);
@@ -1661,7 +1663,7 @@ static int atmel_spi_remove(struct platform_device *pdev)
dma_free_coherent(>dev, BUFFER_SIZE, as->buffer,
as->buffer_dma);
 
-   clk_disable(as->clk);
+   clk_disable_unprepare(as->clk);
clk_put(as->clk);
free_irq(as->irq, master);
iounmap(as->regs);
@@ -1678,7 +1680,7 @@ static int atmel_spi_suspend(struct platform_device 
*pdev, pm_message_t mesg)
struct spi_master   *master = platform_get_drvdata(pdev);
struct atmel_spi*as = spi_master_get_devdata(master);
 
-   clk_disable(as->clk);
+   clk_disable_unprepare(as->clk);
return 0;
 }
 
@@ -1687,7 +1689,7 @@ static int atmel_spi_resume(struct platform_device *pdev)
struct spi_master   *master = platform_get_drvdata(pdev);
struct atmel_spi*as = spi_master_get_devdata(master);
 
-   clk_enable(as->clk);
+   return clk_prepare_enable(as->clk);
return 0;
 }
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v3 5/7] spi: atmel: prepare clk before calling enable

[Boris BREZILLON]

Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: Boris BREZILLON b.brezil...@overkiz.com
---
 drivers/spi/spi-atmel.c |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index ea1ec00..4c6c455 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1579,7 +1579,9 @@ static int atmel_spi_probe(struct platform_device *pdev)
goto out_unmap_regs;
 
/* Initialize the hardware */
-   clk_enable(clk);
+   ret = clk_prepare_enable(clk);
+   if (ret)
+   goto out_unmap_regs;
spi_writel(as, CR, SPI_BIT(SWRST));
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
if (as-caps.has_wdrbt) {
@@ -1609,7 +1611,7 @@ out_free_dma:
 
spi_writel(as, CR, SPI_BIT(SWRST));
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
-   clk_disable(clk);
+   clk_disable_unprepare(clk);
free_irq(irq, master);
 out_unmap_regs:
iounmap(as-regs);
@@ -1661,7 +1663,7 @@ static int atmel_spi_remove(struct platform_device *pdev)
dma_free_coherent(pdev-dev, BUFFER_SIZE, as-buffer,
as-buffer_dma);
 
-   clk_disable(as-clk);
+   clk_disable_unprepare(as-clk);
clk_put(as-clk);
free_irq(as-irq, master);
iounmap(as-regs);
@@ -1678,7 +1680,7 @@ static int atmel_spi_suspend(struct platform_device 
*pdev, pm_message_t mesg)
struct spi_master   *master = platform_get_drvdata(pdev);
struct atmel_spi*as = spi_master_get_devdata(master);
 
-   clk_disable(as-clk);
+   clk_disable_unprepare(as-clk);
return 0;
 }
 
@@ -1687,7 +1689,7 @@ static int atmel_spi_resume(struct platform_device *pdev)
struct spi_master   *master = platform_get_drvdata(pdev);
struct atmel_spi*as = spi_master_get_devdata(master);
 
-   clk_enable(as-clk);
+   return clk_prepare_enable(as-clk);
return 0;
 }
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/