diff options
| -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) | |||
| 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: | |||
| 2988 | probe_err4: | 2983 | probe_err4: |
| 2989 | free_irq(irq, pi); | 2984 | free_irq(irq, pi); |
| 2990 | probe_err3: | 2985 | probe_err3: |
| 2991 | #ifndef CONFIG_PM_RUNTIME | ||
| 2992 | clk_disable(pdmac->clk); | ||
| 2993 | #endif | ||
| 2994 | clk_put(pdmac->clk); | 2986 | clk_put(pdmac->clk); |
| 2995 | probe_err2: | 2987 | probe_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; |
