MLK-10117-3:csi: remove runtime suspend/resume function

Sandor Yu · Nitin Garg · commit 6416f17c9314 · 2015-09-17T09:21:14.000-05:00
CSI v4l2 capture driver have involved to generic pm domain,
runtime_suspend/resume function will been 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 function to
device open/close function.

Signed-off-by: Sandor Yu &lt;R01008@freescale.com&gt;
diff --git a/drivers/media/platform/mxc/subdev/mx6s_capture.c b/drivers/media/platform/mxc/subdev/mx6s_capture.c
@@ -1063,6 +1063,8 @@ static int mx6s_csi_open(struct file *file)
 
 	pm_runtime_get_sync(csi_dev->dev);
 
+	request_bus_freq(BUS_FREQ_HIGH);
+
 	mx6s_csi_init(csi_dev);
 
 	mutex_unlock(&csi_dev->lock);
@@ -1090,6 +1092,8 @@ static int mx6s_csi_close(struct file *file)
 
 	file->private_data = NULL;
 
+	release_bus_freq(BUS_FREQ_HIGH);
+
 	pm_runtime_put_sync_suspend(csi_dev->dev);
 	return 0;
 }
@@ -1701,22 +1705,14 @@ static int mx6s_csi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_RUNTIME
 static int mx6s_csi_runtime_suspend(struct device *dev)
 {
-	int ret = 0;
-
-	release_bus_freq(BUS_FREQ_HIGH);
 	dev_dbg(dev, "csi v4l2 busfreq high release.\n");
-
-	return ret;
+	return 0;
 }
 
 static int mx6s_csi_runtime_resume(struct device *dev)
 {
-	int ret = 0;
-
-	request_bus_freq(BUS_FREQ_HIGH);
 	dev_dbg(dev, "csi v4l2 busfreq high request.\n");
-
-	return ret;
+	return 0;
 }
 #else
 #define	mx6s_csi_runtime_suspend	NULL
