drivers: mmc: 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/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 382f25b2fa458da7667dc158226059344c9828c3..b2bdf5012c5589c0a3238ba2bcf5584aba320445 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1452,8 +1452,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                                                  pdev->id_entry->driver_data;
 
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_add_request(&imx_data->pm_qos_req,
-                       PM_QOS_CPU_DMA_LATENCY, 0);
+               cpu_latency_qos_add_request(&imx_data->pm_qos_req, 0);
 
        imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
        if (IS_ERR(imx_data->clk_ipg)) {
@@ -1572,7 +1571,7 @@ disable_per_clk:
        clk_disable_unprepare(imx_data->clk_per);
 free_sdhci:
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_remove_request(&imx_data->pm_qos_req);
+               cpu_latency_qos_remove_request(&imx_data->pm_qos_req);
        sdhci_pltfm_free(pdev);
        return err;
 }
@@ -1595,7 +1594,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
        clk_disable_unprepare(imx_data->clk_ahb);
 
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_remove_request(&imx_data->pm_qos_req);
+               cpu_latency_qos_remove_request(&imx_data->pm_qos_req);
 
        sdhci_pltfm_free(pdev);
 
@@ -1667,7 +1666,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev)
        clk_disable_unprepare(imx_data->clk_ahb);
 
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_remove_request(&imx_data->pm_qos_req);
+               cpu_latency_qos_remove_request(&imx_data->pm_qos_req);
 
        return ret;
 }
@@ -1680,8 +1679,7 @@ static int sdhci_esdhc_runtime_resume(struct device *dev)
        int err;
 
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_add_request(&imx_data->pm_qos_req,
-                       PM_QOS_CPU_DMA_LATENCY, 0);
+               cpu_latency_qos_add_request(&imx_data->pm_qos_req, 0);
 
        err = clk_prepare_enable(imx_data->clk_ahb);
        if (err)
@@ -1714,7 +1712,7 @@ disable_ahb_clk:
        clk_disable_unprepare(imx_data->clk_ahb);
 remove_pm_qos_request:
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
-               pm_qos_remove_request(&imx_data->pm_qos_req);
+               cpu_latency_qos_remove_request(&imx_data->pm_qos_req);
        return err;
 }
 #endif