sound: Call cpu_latency_qos_*() instead of pm_qos_*()

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

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 336406bcb59e2cd3ded45db70449d390deac2850..151bac1bbd0b6dfe2ee9588ae4aad04030a2555e 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -748,11 +748,11 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
        snd_pcm_timer_resolution_change(substream);
        snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);
 
-       if (pm_qos_request_active(&substream->latency_pm_qos_req))
-               pm_qos_remove_request(&substream->latency_pm_qos_req);
+       if (cpu_latency_qos_request_active(&substream->latency_pm_qos_req))
+               cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
        if ((usecs = period_to_usecs(runtime)) >= 0)
-               pm_qos_add_request(&substream->latency_pm_qos_req,
-                                  PM_QOS_CPU_DMA_LATENCY, usecs);
+               cpu_latency_qos_add_request(&substream->latency_pm_qos_req,
+                                           usecs);
        return 0;
  _error:
        /* hardware might be unusable from this time,
@@ -821,7 +821,7 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
                return -EBADFD;
        result = do_hw_free(substream);
        snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN);
-       pm_qos_remove_request(&substream->latency_pm_qos_req);
+       cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
        return result;
 }
 
@@ -2598,8 +2598,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream)
                substream->ops->close(substream);
                substream->hw_opened = 0;
        }
-       if (pm_qos_request_active(&substream->latency_pm_qos_req))
-               pm_qos_remove_request(&substream->latency_pm_qos_req);
+       if (cpu_latency_qos_request_active(&substream->latency_pm_qos_req))
+               cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
        if (substream->pcm_release) {
                substream->pcm_release(substream);
                substream->pcm_release = NULL;

diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index 68bcec5241f74fb6da8345f722b1ed7a43f6decf..d6563985e008ec321972066497ab73cdb344f33a 100644 (file)
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -325,8 +325,7 @@ int sst_context_init(struct intel_sst_drv *ctx)
                ret = -ENOMEM;
                goto do_free_mem;
        }
-       pm_qos_add_request(ctx->qos, PM_QOS_CPU_DMA_LATENCY,
-                               PM_QOS_DEFAULT_VALUE);
+       cpu_latency_qos_add_request(ctx->qos, PM_QOS_DEFAULT_VALUE);
 
        dev_dbg(ctx->dev, "Requesting FW %s now...\n", ctx->firmware_name);
        ret = request_firmware_nowait(THIS_MODULE, true, ctx->firmware_name,
@@ -364,7 +363,7 @@ void sst_context_cleanup(struct intel_sst_drv *ctx)
        sysfs_remove_group(&ctx->dev->kobj, &sst_fw_version_attr_group);
        flush_scheduled_work();
        destroy_workqueue(ctx->post_msg_wq);
-       pm_qos_remove_request(ctx->qos);
+       cpu_latency_qos_remove_request(ctx->qos);
        kfree(ctx->fw_sg_list.src);
        kfree(ctx->fw_sg_list.dst);
        ctx->fw_sg_list.list_len = 0;

diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c
index ce11c36848c444f66cf3566817e3fde5e6dc4303..9b0e3739c738cbf2d279686bc2eb1d9ec8c69ec4 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_loader.c
+++ b/sound/soc/intel/atom/sst/sst_loader.c
@@ -412,7 +412,7 @@ int sst_load_fw(struct intel_sst_drv *sst_drv_ctx)
                return -ENOMEM;
 
        /* Prevent C-states beyond C6 */
-       pm_qos_update_request(sst_drv_ctx->qos, 0);
+       cpu_latency_qos_update_request(sst_drv_ctx->qos, 0);
 
        sst_drv_ctx->sst_state = SST_FW_LOADING;
 
@@ -442,7 +442,7 @@ int sst_load_fw(struct intel_sst_drv *sst_drv_ctx)
 
 restore:
        /* Re-enable Deeper C-states beyond C6 */
-       pm_qos_update_request(sst_drv_ctx->qos, PM_QOS_DEFAULT_VALUE);
+       cpu_latency_qos_update_request(sst_drv_ctx->qos, PM_QOS_DEFAULT_VALUE);
        sst_free_block(sst_drv_ctx, block);
        dev_dbg(sst_drv_ctx->dev, "fw load successful!!!\n");
 

diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c
index 3f226be123d48ced6ede94c8f89b788aacff6d89..913579c43e9d4a26b7cdfa3be4596895cace864a 100644 (file)
--- a/sound/soc/ti/omap-dmic.c
+++ b/sound/soc/ti/omap-dmic.c
@@ -112,7 +112,7 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream,
 
        mutex_lock(&dmic->mutex);
 
-       pm_qos_remove_request(&dmic->pm_qos_req);
+       cpu_latency_qos_remove_request(&dmic->pm_qos_req);
 
        if (!dai->active)
                dmic->active = 0;
@@ -230,8 +230,9 @@ static int omap_dmic_dai_prepare(struct snd_pcm_substream *substream,
        struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
        u32 ctrl;
 
-       if (pm_qos_request_active(&dmic->pm_qos_req))
-               pm_qos_update_request(&dmic->pm_qos_req, dmic->latency);
+       if (cpu_latency_qos_request_active(&dmic->pm_qos_req))
+               cpu_latency_qos_update_request(&dmic->pm_qos_req,
+                                              dmic->latency);
 
        /* Configure uplink threshold */
        omap_dmic_write(dmic, OMAP_DMIC_FIFO_CTRL_REG, dmic->threshold);

diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c
index 26b503bbdb5fefe51443c6b73c9d5f8e58e80d5b..302d5c493c29d285c67483d2896526349a1dae31 100644 (file)
--- a/sound/soc/ti/omap-mcbsp.c
+++ b/sound/soc/ti/omap-mcbsp.c
@@ -836,10 +836,10 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream,
        int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
 
        if (mcbsp->latency[stream2])
-               pm_qos_update_request(&mcbsp->pm_qos_req,
-                                     mcbsp->latency[stream2]);
+               cpu_latency_qos_update_request(&mcbsp->pm_qos_req,
+                                              mcbsp->latency[stream2]);
        else if (mcbsp->latency[stream1])
-               pm_qos_remove_request(&mcbsp->pm_qos_req);
+               cpu_latency_qos_remove_request(&mcbsp->pm_qos_req);
 
        mcbsp->latency[stream1] = 0;
 
@@ -863,10 +863,10 @@ static int omap_mcbsp_dai_prepare(struct snd_pcm_substream *substream,
        if (!latency || mcbsp->latency[stream1] < latency)
                latency = mcbsp->latency[stream1];
 
-       if (pm_qos_request_active(pm_qos_req))
-               pm_qos_update_request(pm_qos_req, latency);
+       if (cpu_latency_qos_request_active(pm_qos_req))
+               cpu_latency_qos_update_request(pm_qos_req, latency);
        else if (latency)
-               pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency);
+               cpu_latency_qos_add_request(pm_qos_req, latency);
 
        return 0;
 }
@@ -1434,8 +1434,8 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
        if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                mcbsp->pdata->ops->free(mcbsp->id);
 
-       if (pm_qos_request_active(&mcbsp->pm_qos_req))
-               pm_qos_remove_request(&mcbsp->pm_qos_req);
+       if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req))
+               cpu_latency_qos_remove_request(&mcbsp->pm_qos_req);
 
        if (mcbsp->pdata->buffer_size)
                sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);

diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index a726cd7a82526e81acc1077ab85dc3a1527e4ebd..d7ac4df6f2d9aec9453f36831cc9c8ab9a4a51ea 100644 (file)
--- a/sound/soc/ti/omap-mcpdm.c
+++ b/sound/soc/ti/omap-mcpdm.c
@@ -281,10 +281,10 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
        }
 
        if (mcpdm->latency[stream2])
-               pm_qos_update_request(&mcpdm->pm_qos_req,
-                                     mcpdm->latency[stream2]);
+               cpu_latency_qos_update_request(&mcpdm->pm_qos_req,
+                                              mcpdm->latency[stream2]);
        else if (mcpdm->latency[stream1])
-               pm_qos_remove_request(&mcpdm->pm_qos_req);
+               cpu_latency_qos_remove_request(&mcpdm->pm_qos_req);
 
        mcpdm->latency[stream1] = 0;
 
@@ -386,10 +386,10 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream,
        if (!latency || mcpdm->latency[stream1] < latency)
                latency = mcpdm->latency[stream1];
 
-       if (pm_qos_request_active(pm_qos_req))
-               pm_qos_update_request(pm_qos_req, latency);
+       if (cpu_latency_qos_request_active(pm_qos_req))
+               cpu_latency_qos_update_request(pm_qos_req, latency);
        else if (latency)
-               pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency);
+               cpu_latency_qos_add_request(pm_qos_req, latency);
 
        if (!omap_mcpdm_active(mcpdm)) {
                omap_mcpdm_start(mcpdm);
@@ -451,8 +451,8 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai)
        free_irq(mcpdm->irq, (void *)mcpdm);
        pm_runtime_disable(mcpdm->dev);
 
-       if (pm_qos_request_active(&mcpdm->pm_qos_req))
-               pm_qos_remove_request(&mcpdm->pm_qos_req);
+       if (cpu_latency_qos_request_active(&mcpdm->pm_qos_req))
+               cpu_latency_qos_remove_request(&mcpdm->pm_qos_req);
 
        return 0;
 }