Merge tag 'usb-ci-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...

[platform/kernel/linux-starfive.git] / drivers / usb / chipidea / ci_hdrc_imx.c

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index fb4097f..5ae1636 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -402,8 +402,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
        }
 
        if (pdata.flags & CI_HDRC_PMQOS)
-               pm_qos_add_request(&data->pm_qos_req,
-                       PM_QOS_CPU_DMA_LATENCY, 0);
+               cpu_latency_qos_add_request(&data->pm_qos_req, 0);
 
        ret = imx_get_clks(dev);
        if (ret)
@@ -489,7 +488,7 @@ disable_hsic_regulator:
                /* don't overwrite original ret (cf. EPROBE_DEFER) */
                regulator_disable(data->hsic_pad_regulator);
        if (pdata.flags & CI_HDRC_PMQOS)
-               pm_qos_remove_request(&data->pm_qos_req);
+               cpu_latency_qos_remove_request(&data->pm_qos_req);
        data->ci_pdev = NULL;
        return ret;
 }
@@ -510,7 +509,7 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
        if (data->ci_pdev) {
                imx_disable_unprepare_clks(&pdev->dev);
                if (data->plat_data->flags & CI_HDRC_PMQOS)
-                       pm_qos_remove_request(&data->pm_qos_req);
+                       cpu_latency_qos_remove_request(&data->pm_qos_req);
                if (data->hsic_pad_regulator)
                        regulator_disable(data->hsic_pad_regulator);
        }
@@ -538,7 +537,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev)
 
        imx_disable_unprepare_clks(dev);
        if (data->plat_data->flags & CI_HDRC_PMQOS)
-               pm_qos_remove_request(&data->pm_qos_req);
+               cpu_latency_qos_remove_request(&data->pm_qos_req);
 
        data->in_lpm = true;
 
@@ -558,8 +557,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev)
        }
 
        if (data->plat_data->flags & CI_HDRC_PMQOS)
-               pm_qos_add_request(&data->pm_qos_req,
-                       PM_QOS_CPU_DMA_LATENCY, 0);
+               cpu_latency_qos_add_request(&data->pm_qos_req, 0);
 
        ret = imx_prepare_enable_clks(dev);
        if (ret)