Merge tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / sound / soc / ti / omap-mcpdm.c

diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index a726cd7..f2dbade 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;
 }
@@ -532,7 +532,7 @@ static const struct snd_soc_component_driver omap_mcpdm_component = {
 void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd,
                                    u8 rx1, u8 rx2)
 {
-       struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(rtd->cpu_dai);
+       struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
 
        mcpdm->dn_rx_offset = MCPDM_DNOFST_RX1(rx1) | MCPDM_DNOFST_RX2(rx2);
 }