torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

DMA: PL330: Remove controller clock enable/disable

Browse Source 
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>
This commit is contained in:
Inderpal Singh 2012-09-07 12:14:47 +05:30 committed by Vinod Koul
parent 921eeadbbd
commit faf6fbc6f2
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/dma/pl330.c
View File

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