diff options
| author | Inderpal Singh <inderpal.singh@linaro.org> | 2012-09-07 12:14:47 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-09-18 08:59:52 +0530 |
| commit | faf6fbc6f2ca3b34bf464a8bb079a998e571957c (patch) | |
| tree | 80ef23d63afe7423e762f020b0b6beeeef2cba8e /drivers/dma/pl330.c | |
| parent | 921eeadbbdd7ffba16937a3b63e408c980c39db6 (diff) | |
| download | blackbird-op-linux-faf6fbc6f2ca3b34bf464a8bb079a998e571957c.tar.gz blackbird-op-linux-faf6fbc6f2ca3b34bf464a8bb079a998e571957c.zip | |
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.c | 12 |
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) 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); @@ -2988,9 +2983,6 @@ probe_err5: 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); @@ -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; |
