MLK-10117-2:pxp: Remove runtime suspend/resume function

Sandor Yu · Nitin Garg · commit 9138e767f0a4 · 2015-09-17T09:21:14.000-05:00
pxp module have involved to generic pm domain,
runtime_suspend/resume function will called when system
suspend/resume. It will cause request_bus_freq/release_bus_freq
called counter mismatch.
So move request_bus_freq/release_bus_freq to clk_enable/disable
function.

Signed-off-by: Sandor Yu &lt;R01008@freescale.com&gt;
diff --git a/drivers/dma/pxp/pxp_dma_v2.c b/drivers/dma/pxp/pxp_dma_v2.c
@@ -1074,6 +1074,8 @@ static void pxp_clk_enable(struct pxps *pxp)
 		return;
 	}
 
+	request_bus_freq(BUS_FREQ_HIGH);
+
 	pm_runtime_get_sync(pxp->dev);
 
 	if (pxp->clk_disp_axi)
@@ -1108,6 +1110,8 @@ static void pxp_clk_disable(struct pxps *pxp)
 	pm_runtime_put_sync_suspend(pxp->dev);
 
 	mutex_unlock(&pxp->clk_mutex);
+
+	release_bus_freq(BUS_FREQ_HIGH);
 }
 
 static inline void clkoff_callback(struct work_struct *w)
@@ -1803,17 +1807,13 @@ static int pxp_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int pxp_runtime_suspend(struct device *dev)
 {
-	release_bus_freq(BUS_FREQ_HIGH);
 	dev_dbg(dev, "pxp busfreq high release.\n");
-
 	return 0;
 }
 
 static int pxp_runtime_resume(struct device *dev)
 {
-	request_bus_freq(BUS_FREQ_HIGH);
 	dev_dbg(dev, "pxp busfreq high request.\n");
-
 	return 0;
 }
 #else

Original file line number	Diff line number	Diff line change
`@@ -1074,6 +1074,8 @@ static void pxp_clk_enable(struct pxps *pxp)`
`1074`	`1074`	`return;`
`1075`	`1075`	`}`
`1076`	`1076`
	`1077`	`+ request_bus_freq(BUS_FREQ_HIGH);`
	`1078`	`+`
`1077`	`1079`	`pm_runtime_get_sync(pxp->dev);`
`1078`	`1080`
`1079`	`1081`	`if (pxp->clk_disp_axi)`
`@@ -1108,6 +1110,8 @@ static void pxp_clk_disable(struct pxps *pxp)`
`1108`	`1110`	`pm_runtime_put_sync_suspend(pxp->dev);`
`1109`	`1111`
`1110`	`1112`	`mutex_unlock(&pxp->clk_mutex);`
	`1113`	`+`
	`1114`	`+ release_bus_freq(BUS_FREQ_HIGH);`
`1111`	`1115`	`}`
`1112`	`1116`
`1113`	`1117`	`static inline void clkoff_callback(struct work_struct *w)`
`@@ -1803,17 +1807,13 @@ static int pxp_resume(struct device *dev)`
`1803`	`1807`	`#ifdef CONFIG_PM_RUNTIME`
`1804`	`1808`	`static int pxp_runtime_suspend(struct device *dev)`
`1805`	`1809`	`{`
`1806`		`- release_bus_freq(BUS_FREQ_HIGH);`
`1807`	`1810`	`dev_dbg(dev, "pxp busfreq high release.\n");`
`1808`		`-`
`1809`	`1811`	`return 0;`
`1810`	`1812`	`}`
`1811`	`1813`
`1812`	`1814`	`static int pxp_runtime_resume(struct device *dev)`
`1813`	`1815`	`{`
`1814`		`- request_bus_freq(BUS_FREQ_HIGH);`
`1815`	`1816`	`dev_dbg(dev, "pxp busfreq high request.\n");`
`1816`		`-`
`1817`	`1817`	`return 0;`
`1818`	`1818`	`}`
`1819`	`1819`	`#else`