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

[tomoyo/tomoyo-test1.git] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 336406b..151bac1 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;