Skip to content

Commit 5371a79

Browse files
rafaeljwrafaeljw
committed
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 <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Takashi Iwai <[email protected]> Reviewed-by: Amit Kucheria <[email protected]> Tested-by: Amit Kucheria <[email protected]>
1 parent 77b3524 commit 5371a79

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎sound/core/pcm_native.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -748,11 +748,11 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
748748
snd_pcm_timer_resolution_change(substream);
749749
snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);
750750

751-
if (pm_qos_request_active(&substream->latency_pm_qos_req))
752-
pm_qos_remove_request(&substream->latency_pm_qos_req);
751+
if (cpu_latency_qos_request_active(&substream->latency_pm_qos_req))
752+
cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
753753
if ((usecs = period_to_usecs(runtime)) >= 0)
754-
pm_qos_add_request(&substream->latency_pm_qos_req,
755-
PM_QOS_CPU_DMA_LATENCY, usecs);
754+
cpu_latency_qos_add_request(&substream->latency_pm_qos_req,
755+
usecs);
756756
return 0;
757757
_error:
758758
/* hardware might be unusable from this time,
@@ -821,7 +821,7 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
821821
return -EBADFD;
822822
result = do_hw_free(substream);
823823
snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN);
824-
pm_qos_remove_request(&substream->latency_pm_qos_req);
824+
cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
825825
return result;
826826
}
827827

@@ -2598,8 +2598,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream)
25982598
substream->ops->close(substream);
25992599
substream->hw_opened = 0;
26002600
}
2601-
if (pm_qos_request_active(&substream->latency_pm_qos_req))
2602-
pm_qos_remove_request(&substream->latency_pm_qos_req);
2601+
if (cpu_latency_qos_request_active(&substream->latency_pm_qos_req))
2602+
cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
26032603
if (substream->pcm_release) {
26042604
substream->pcm_release(substream);
26052605
substream->pcm_release = NULL;

‎sound/soc/intel/atom/sst/sst.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,7 @@ int sst_context_init(struct intel_sst_drv *ctx)
325325
ret = -ENOMEM;
326326
goto do_free_mem;
327327
}
328-
pm_qos_add_request(ctx->qos, PM_QOS_CPU_DMA_LATENCY,
329-
PM_QOS_DEFAULT_VALUE);
328+
cpu_latency_qos_add_request(ctx->qos, PM_QOS_DEFAULT_VALUE);
330329

331330
dev_dbg(ctx->dev, "Requesting FW %s now...\n", ctx->firmware_name);
332331
ret = request_firmware_nowait(THIS_MODULE, true, ctx->firmware_name,
@@ -364,7 +363,7 @@ void sst_context_cleanup(struct intel_sst_drv *ctx)
364363
sysfs_remove_group(&ctx->dev->kobj, &sst_fw_version_attr_group);
365364
flush_scheduled_work();
366365
destroy_workqueue(ctx->post_msg_wq);
367-
pm_qos_remove_request(ctx->qos);
366+
cpu_latency_qos_remove_request(ctx->qos);
368367
kfree(ctx->fw_sg_list.src);
369368
kfree(ctx->fw_sg_list.dst);
370369
ctx->fw_sg_list.list_len = 0;

‎sound/soc/intel/atom/sst/sst_loader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ int sst_load_fw(struct intel_sst_drv *sst_drv_ctx)
412412
return -ENOMEM;
413413

414414
/* Prevent C-states beyond C6 */
415-
pm_qos_update_request(sst_drv_ctx->qos, 0);
415+
cpu_latency_qos_update_request(sst_drv_ctx->qos, 0);
416416

417417
sst_drv_ctx->sst_state = SST_FW_LOADING;
418418

@@ -442,7 +442,7 @@ int sst_load_fw(struct intel_sst_drv *sst_drv_ctx)
442442

443443
restore:
444444
/* Re-enable Deeper C-states beyond C6 */
445-
pm_qos_update_request(sst_drv_ctx->qos, PM_QOS_DEFAULT_VALUE);
445+
cpu_latency_qos_update_request(sst_drv_ctx->qos, PM_QOS_DEFAULT_VALUE);
446446
sst_free_block(sst_drv_ctx, block);
447447
dev_dbg(sst_drv_ctx->dev, "fw load successful!!!\n");
448448

‎sound/soc/ti/omap-dmic.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream,
112112

113113
mutex_lock(&dmic->mutex);
114114

115-
pm_qos_remove_request(&dmic->pm_qos_req);
115+
cpu_latency_qos_remove_request(&dmic->pm_qos_req);
116116

117117
if (!dai->active)
118118
dmic->active = 0;
@@ -230,8 +230,9 @@ static int omap_dmic_dai_prepare(struct snd_pcm_substream *substream,
230230
struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
231231
u32 ctrl;
232232

233-
if (pm_qos_request_active(&dmic->pm_qos_req))
234-
pm_qos_update_request(&dmic->pm_qos_req, dmic->latency);
233+
if (cpu_latency_qos_request_active(&dmic->pm_qos_req))
234+
cpu_latency_qos_update_request(&dmic->pm_qos_req,
235+
dmic->latency);
235236

236237
/* Configure uplink threshold */
237238
omap_dmic_write(dmic, OMAP_DMIC_FIFO_CTRL_REG, dmic->threshold);

‎sound/soc/ti/omap-mcbsp.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -836,10 +836,10 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream,
836836
int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
837837

838838
if (mcbsp->latency[stream2])
839-
pm_qos_update_request(&mcbsp->pm_qos_req,
840-
mcbsp->latency[stream2]);
839+
cpu_latency_qos_update_request(&mcbsp->pm_qos_req,
840+
mcbsp->latency[stream2]);
841841
else if (mcbsp->latency[stream1])
842-
pm_qos_remove_request(&mcbsp->pm_qos_req);
842+
cpu_latency_qos_remove_request(&mcbsp->pm_qos_req);
843843

844844
mcbsp->latency[stream1] = 0;
845845

@@ -863,10 +863,10 @@ static int omap_mcbsp_dai_prepare(struct snd_pcm_substream *substream,
863863
if (!latency || mcbsp->latency[stream1] < latency)
864864
latency = mcbsp->latency[stream1];
865865

866-
if (pm_qos_request_active(pm_qos_req))
867-
pm_qos_update_request(pm_qos_req, latency);
866+
if (cpu_latency_qos_request_active(pm_qos_req))
867+
cpu_latency_qos_update_request(pm_qos_req, latency);
868868
else if (latency)
869-
pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency);
869+
cpu_latency_qos_add_request(pm_qos_req, latency);
870870

871871
return 0;
872872
}
@@ -1434,8 +1434,8 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
14341434
if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
14351435
mcbsp->pdata->ops->free(mcbsp->id);
14361436

1437-
if (pm_qos_request_active(&mcbsp->pm_qos_req))
1438-
pm_qos_remove_request(&mcbsp->pm_qos_req);
1437+
if (cpu_latency_qos_request_active(&mcbsp->pm_qos_req))
1438+
cpu_latency_qos_remove_request(&mcbsp->pm_qos_req);
14391439

14401440
if (mcbsp->pdata->buffer_size)
14411441
sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);

‎sound/soc/ti/omap-mcpdm.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
281281
}
282282

283283
if (mcpdm->latency[stream2])
284-
pm_qos_update_request(&mcpdm->pm_qos_req,
285-
mcpdm->latency[stream2]);
284+
cpu_latency_qos_update_request(&mcpdm->pm_qos_req,
285+
mcpdm->latency[stream2]);
286286
else if (mcpdm->latency[stream1])
287-
pm_qos_remove_request(&mcpdm->pm_qos_req);
287+
cpu_latency_qos_remove_request(&mcpdm->pm_qos_req);
288288

289289
mcpdm->latency[stream1] = 0;
290290

@@ -386,10 +386,10 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream,
386386
if (!latency || mcpdm->latency[stream1] < latency)
387387
latency = mcpdm->latency[stream1];
388388

389-
if (pm_qos_request_active(pm_qos_req))
390-
pm_qos_update_request(pm_qos_req, latency);
389+
if (cpu_latency_qos_request_active(pm_qos_req))
390+
cpu_latency_qos_update_request(pm_qos_req, latency);
391391
else if (latency)
392-
pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency);
392+
cpu_latency_qos_add_request(pm_qos_req, latency);
393393

394394
if (!omap_mcpdm_active(mcpdm)) {
395395
omap_mcpdm_start(mcpdm);
@@ -451,8 +451,8 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai)
451451
free_irq(mcpdm->irq, (void *)mcpdm);
452452
pm_runtime_disable(mcpdm->dev);
453453

454-
if (pm_qos_request_active(&mcpdm->pm_qos_req))
455-
pm_qos_remove_request(&mcpdm->pm_qos_req);
454+
if (cpu_latency_qos_request_active(&mcpdm->pm_qos_req))
455+
cpu_latency_qos_remove_request(&mcpdm->pm_qos_req);
456456

457457
return 0;
458458
}

0 commit comments

Comments
 (0)