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 <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index d8e7eb2f97b90ef3e7e3614ea22fb6d4416fd471..a479af3ae31d1a8ee9047812473438060b52d718 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -393,8 +393,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)
@@ -478,7 +477,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;
 }
@@ -499,7 +498,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);
        }
@@ -527,7 +526,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;
 
@@ -547,8 +546,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)