Merge tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[platform/kernel/linux-rpi.git] / drivers / mmc / host / sdhci-esdhc-imx.c

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index b38b9d7..5ec8e4b 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1555,8 +1555,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)) {
@@ -1678,7 +1677,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;
 }
@@ -1701,7 +1700,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);
 
@@ -1789,7 +1788,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;
 }
@@ -1802,8 +1801,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);
 
        if (imx_data->socdata->flags & ESDHC_FLAG_CLK_RATE_LOST_IN_PM_RUNTIME)
                clk_set_rate(imx_data->clk_per, pltfm_host->clock);
@@ -1839,7 +1837,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