drivers: media: Call cpu_latency_qos_*() instead of pm_qos_*()

Call cpu_latency_qos_add/remove_request() instead of
pm_qos_add/remove_request(), respectively, because the
latter are going to be dropped.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>

diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 342cabf..a8ac94f 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1008,8 +1008,7 @@ int saa7134_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
         */
        if ((dmaq == &dev->video_q && !vb2_is_streaming(&dev->vbi_vbq)) ||
            (dmaq == &dev->vbi_q && !vb2_is_streaming(&dev->video_vbq)))
-               pm_qos_add_request(&dev->qos_request,
-                       PM_QOS_CPU_DMA_LATENCY, 20);
+               cpu_latency_qos_add_request(&dev->qos_request, 20);
        dmaq->seq_nr = 0;
 
        return 0;
@@ -1024,7 +1023,7 @@ void saa7134_vb2_stop_streaming(struct vb2_queue *vq)
 
        if ((dmaq == &dev->video_q && !vb2_is_streaming(&dev->vbi_vbq)) ||
            (dmaq == &dev->vbi_q && !vb2_is_streaming(&dev->video_vbq)))
-               pm_qos_remove_request(&dev->qos_request);
+               cpu_latency_qos_remove_request(&dev->qos_request);
 }
 
 static const struct vb2_ops vb2_qops = {

diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
index 78841b9..1cd4f7b 100644 (file)
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -646,7 +646,7 @@ static int viacam_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
         * requirement which will keep the CPU out of the deeper sleep
         * states.
         */
-       pm_qos_add_request(&cam->qos_request, PM_QOS_CPU_DMA_LATENCY, 50);
+       cpu_latency_qos_add_request(&cam->qos_request, 50);
        viacam_start_engine(cam);
        return 0;
 out:
@@ -662,7 +662,7 @@ static void viacam_vb2_stop_streaming(struct vb2_queue *vq)
        struct via_camera *cam = vb2_get_drv_priv(vq);
        struct via_buffer *buf, *tmp;
 
-       pm_qos_remove_request(&cam->qos_request);
+       cpu_latency_qos_remove_request(&cam->qos_request);
        viacam_stop_engine(cam);
 
        list_for_each_entry_safe(buf, tmp, &cam->buffer_queue, queue) {