2 files changed, 8 insertions, 9 deletions

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 0d428d0896d..cbe815dfbdc 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -648,9 +648,6 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
                 substream->number = idx;
                 substream->stream = stream;
                 sprintf(substream->name, "subdevice #%i", idx);
-                snprintf(substream->latency_id, sizeof(substream->latency_id),
-                         "ALSA-PCM%d-%d%c%d", pcm->card->number, pcm->device,
-                         (stream ? 'c' : 'p'), idx);
                 substream->buffer_bytes_max = UINT_MAX;
                 if (prev == NULL)
                         pstr->substream = substream;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 20b5982c996..192dd407512 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -484,11 +484,13 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
         snd_pcm_timer_resolution_change(substream);
         runtime->status->state = SNDRV_PCM_STATE_SETUP;
 
-        pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
-                                substream->latency_id);
+        if (substream->latency_pm_qos_req) {
+                pm_qos_remove_request(substream->latency_pm_qos_req);
+                substream->latency_pm_qos_req = NULL;
+        }
         if ((usecs = period_to_usecs(runtime)) >= 0)
-                pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY,
-                                        substream->latency_id, usecs);
+                substream->latency_pm_qos_req = pm_qos_add_request(
+                                        PM_QOS_CPU_DMA_LATENCY, usecs);
         return 0;
  _error:
         /* hardware might be unuseable from this time,
@@ -543,8 +545,8 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
         if (substream->ops->hw_free)
                 result = substream->ops->hw_free(substream);
         runtime->status->state = SNDRV_PCM_STATE_OPEN;
-        pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
-                substream->latency_id);
+        pm_qos_remove_request(substream->latency_pm_qos_req);
+        substream->latency_pm_qos_req = NULL;
         return result;
 }