Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faf6fbc6 authored by Inderpal Singh's avatar Inderpal Singh Committed by Vinod Koul
Browse files

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: default avatarInderpal Singh <inderpal.singh@linaro.org>
Tested-by: default avatarChander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 921eeadb

drivers/dma/pl330.c

+0 −12
Original line number Diff line number Diff line
@@ -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 @@ 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);
@@ -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;