Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f784d9c90469d75a9f7a38c1568f47e95ae504ca

Authored by Boris BREZILLON
Committed by Vinod Koul
1 parent c3dbc60c9b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

dmaengine: at_hdmac: prepare clk before calling enable 

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

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
[nicolas.ferre@atmel.com: remove return code checking in at_dma_resume_noirq()]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Showing 1 changed file with 9 additions and 6 deletions Side-by-side Diff

drivers/dma/at_hdmac.c
Diff comments   View file @ f784d9c
... ... @@ -1460,7 +1460,9 @@
1460 1460 err = PTR_ERR(atdma->clk);
1461 1461 goto err_clk;
1462 1462 }
1463   - clk_enable(atdma->clk);
  1463 + err = clk_prepare_enable(atdma->clk);
  1464 + if (err)
  1465 + goto err_clk_prepare;
1464 1466  
1465 1467 /* force dma off, just in case */
1466 1468 at_dma_off(atdma);
... ... @@ -1560,7 +1562,8 @@
1560 1562 err_pool_create:
1561 1563 free_irq(platform_get_irq(pdev, 0), atdma);
1562 1564 err_irq:
1563   - clk_disable(atdma->clk);
  1565 + clk_disable_unprepare(atdma->clk);
  1566 +err_clk_prepare:
1564 1567 clk_put(atdma->clk);
1565 1568 err_clk:
1566 1569 iounmap(atdma->regs);
... ... @@ -1596,7 +1599,7 @@
1596 1599 list_del(&chan->device_node);
1597 1600 }
1598 1601  
1599   - clk_disable(atdma->clk);
  1602 + clk_disable_unprepare(atdma->clk);
1600 1603 clk_put(atdma->clk);
1601 1604  
1602 1605 iounmap(atdma->regs);
... ... @@ -1615,7 +1618,7 @@
1615 1618 struct at_dma *atdma = platform_get_drvdata(pdev);
1616 1619  
1617 1620 at_dma_off(platform_get_drvdata(pdev));
1618   - clk_disable(atdma->clk);
  1621 + clk_disable_unprepare(atdma->clk);
1619 1622 }
1620 1623  
1621 1624 static int at_dma_prepare(struct device *dev)
... ... @@ -1672,7 +1675,7 @@
1672 1675  
1673 1676 /* disable DMA controller */
1674 1677 at_dma_off(atdma);
1675   - clk_disable(atdma->clk);
  1678 + clk_disable_unprepare(atdma->clk);
1676 1679 return 0;
1677 1680 }
1678 1681  
... ... @@ -1702,7 +1705,7 @@
1702 1705 struct dma_chan *chan, *_chan;
1703 1706  
1704 1707 /* bring back DMA controller */
1705   - clk_enable(atdma->clk);
  1708 + clk_prepare_enable(atdma->clk);
1706 1709 dma_writel(atdma, EN, AT_DMA_ENABLE);
1707 1710  
1708 1711 /* clear any pending interrupt */