Skip to content

Commit

Permalink
DMA: PL330: Remove controller clock enable/disable
Browse files Browse the repository at this point in the history
The controller clock is being enabled/disabled in AMBA bus
infrastructre in probe/remove functions. Hence, its not required
at driver level probe/remove.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
Tested-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Inderpal Singh authored and Vinod Koul committed Sep 18, 2012
1 parent 921eead commit faf6fbc
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/dma/pl330.c
Original file line number Diff line number Diff line change
Expand Up @@ -2896,11 +2896,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)

amba_set_drvdata(adev, pdmac);

#ifndef CONFIG_PM_RUNTIME
/* enable dma clk */
clk_enable(pdmac->clk);
#endif

irq = adev->irq[0];
ret = request_irq(irq, pl330_irq_handler, 0,
dev_name(&adev->dev), pi);
Expand Down Expand Up @@ -2988,9 +2983,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
probe_err4:
free_irq(irq, pi);
probe_err3:
#ifndef CONFIG_PM_RUNTIME
clk_disable(pdmac->clk);
#endif
clk_put(pdmac->clk);
probe_err2:
iounmap(pi->base);
Expand Down Expand Up @@ -3038,10 +3030,6 @@ static int __devexit pl330_remove(struct amba_device *adev)
res = &adev->res;
release_mem_region(res->start, resource_size(res));

#ifndef CONFIG_PM_RUNTIME
clk_disable(pdmac->clk);
#endif

kfree(pdmac);

return 0;
Expand Down

0 comments on commit faf6fbc

Please sign in to comment.