Skip to content

Commit 77b3524

Browse files
committed
drivers: usb: Call cpu_latency_qos_*() instead of pm_qos_*()
Call cpu_latency_qos_add/remove_request() instead of pm_qos_add/remove_request(), 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]> Reviewed-by: Amit Kucheria <[email protected]> Tested-by: Amit Kucheria <[email protected]>
1 parent 01d2b18 commit 77b3524

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

drivers/usb/chipidea/ci_hdrc_imx.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
393393
}
394394

395395
if (pdata.flags & CI_HDRC_PMQOS)
396-
pm_qos_add_request(&data->pm_qos_req,
397-
PM_QOS_CPU_DMA_LATENCY, 0);
396+
cpu_latency_qos_add_request(&data->pm_qos_req, 0);
398397

399398
ret = imx_get_clks(dev);
400399
if (ret)
@@ -478,7 +477,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
478477
/* don't overwrite original ret (cf. EPROBE_DEFER) */
479478
regulator_disable(data->hsic_pad_regulator);
480479
if (pdata.flags & CI_HDRC_PMQOS)
481-
pm_qos_remove_request(&data->pm_qos_req);
480+
cpu_latency_qos_remove_request(&data->pm_qos_req);
482481
data->ci_pdev = NULL;
483482
return ret;
484483
}
@@ -499,7 +498,7 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
499498
if (data->ci_pdev) {
500499
imx_disable_unprepare_clks(&pdev->dev);
501500
if (data->plat_data->flags & CI_HDRC_PMQOS)
502-
pm_qos_remove_request(&data->pm_qos_req);
501+
cpu_latency_qos_remove_request(&data->pm_qos_req);
503502
if (data->hsic_pad_regulator)
504503
regulator_disable(data->hsic_pad_regulator);
505504
}
@@ -527,7 +526,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev)
527526

528527
imx_disable_unprepare_clks(dev);
529528
if (data->plat_data->flags & CI_HDRC_PMQOS)
530-
pm_qos_remove_request(&data->pm_qos_req);
529+
cpu_latency_qos_remove_request(&data->pm_qos_req);
531530

532531
data->in_lpm = true;
533532

@@ -547,8 +546,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev)
547546
}
548547

549548
if (data->plat_data->flags & CI_HDRC_PMQOS)
550-
pm_qos_add_request(&data->pm_qos_req,
551-
PM_QOS_CPU_DMA_LATENCY, 0);
549+
cpu_latency_qos_add_request(&data->pm_qos_req, 0);
552550

553551
ret = imx_prepare_enable_clks(dev);
554552
if (ret)

0 commit comments

Comments
 (0)