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

Commit 3506c0d5 authored by Tushar Behera's avatar Tushar Behera Committed by Vinod Koul
Browse files

DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove 



amba_probe() now calls pm_runtime_get_noresume() and pm_runtime_enable()
for the devices before the device probe is called. Hence we don't need
to call pm_runtime_get_xxx and pm_runtime_enable() in device probe again.
In the same way, since amba_remove() calls the respective pm_runtime
functions, those functions need not be called from device remove.

This patch fixes following run time error with pl330 driver.

dma-pl330 dma-pl330.0: Unbalanced pm_runtime_enable!
dma-pl330 dma-pl330.0: failed to get runtime pm

Signed-off-by: default avatarGiridhar Maruthy <giridhar.maruthy@linaro.org>
Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent f910fb8f

drivers/dma/pl330.c

+2 −15
Original line number Diff line number Diff line
@@ -820,17 +820,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 


	amba_set_drvdata(adev, pdmac);



#ifdef CONFIG_PM_RUNTIME

	/* to use the runtime PM helper functions */

	pm_runtime_enable(&adev->dev);



	/* enable the power domain */

	if (pm_runtime_get_sync(&adev->dev)) {

		dev_err(&adev->dev, "failed to get runtime pm\n");

		ret = -ENODEV;

		goto probe_err1;

	}

#else

#ifndef CONFIG_PM_RUNTIME

	/* enable dma clk */

	clk_enable(pdmac->clk);

#endif
@@ -971,10 +961,7 @@ static int __devexit pl330_remove(struct amba_device *adev) 
	res = &adev->res;

	release_mem_region(res->start, resource_size(res));



#ifdef CONFIG_PM_RUNTIME

	pm_runtime_put(&adev->dev);

	pm_runtime_disable(&adev->dev);

#else

#ifndef CONFIG_PM_RUNTIME

	clk_disable(pdmac->clk);

#endif