aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/pl330.c
diff options
context:
space:
mode:
authorInderpal Singh <inderpal.singh@linaro.org>2012-09-07 02:44:47 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-09-17 23:29:52 -0400
commitfaf6fbc6f2ca3b34bf464a8bb079a998e571957c (patch)
tree80ef23d63afe7423e762f020b0b6beeeef2cba8e /drivers/dma/pl330.c
parent921eeadbbdd7ffba16937a3b63e408c980c39db6 (diff)
DMA: PL330: Remove controller clock enable/disable
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>
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r--drivers/dma/pl330.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 600ea5ea9827..3a434c4b63e6 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2896,11 +2896,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
2896 2896
2897 amba_set_drvdata(adev, pdmac); 2897 amba_set_drvdata(adev, pdmac);
2898 2898
2899#ifndef CONFIG_PM_RUNTIME
2900 /* enable dma clk */
2901 clk_enable(pdmac->clk);
2902#endif
2903
2904 irq = adev->irq[0]; 2899 irq = adev->irq[0];
2905 ret = request_irq(irq, pl330_irq_handler, 0, 2900 ret = request_irq(irq, pl330_irq_handler, 0,
2906 dev_name(&adev->dev), pi); 2901 dev_name(&adev->dev), pi);
@@ -2988,9 +2983,6 @@ probe_err5:
2988probe_err4: 2983probe_err4:
2989 free_irq(irq, pi); 2984 free_irq(irq, pi);
2990probe_err3: 2985probe_err3:
2991#ifndef CONFIG_PM_RUNTIME
2992 clk_disable(pdmac->clk);
2993#endif
2994 clk_put(pdmac->clk); 2986 clk_put(pdmac->clk);
2995probe_err2: 2987probe_err2:
2996 iounmap(pi->base); 2988 iounmap(pi->base);
@@ -3038,10 +3030,6 @@ static int __devexit pl330_remove(struct amba_device *adev)
3038 res = &adev->res; 3030 res = &adev->res;
3039 release_mem_region(res->start, resource_size(res)); 3031 release_mem_region(res->start, resource_size(res));
3040 3032
3041#ifndef CONFIG_PM_RUNTIME
3042 clk_disable(pdmac->clk);
3043#endif
3044
3045 kfree(pdmac); 3033 kfree(pdmac);
3046 3034
3047 return 0; 3035 return 0;