OSDN Git Service

mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4
authorDouglas Anderson <dianders@chromium.org>
Thu, 3 Sep 2020 23:24:36 +0000 (16:24 -0700)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 7 Sep 2020 12:20:17 +0000 (14:20 +0200)
This is like commit 3d3451124f3d ("mmc: sdhci-msm: Prefer asynchronous
probe") but applied to a whole pile of drivers.  This batch converts
the drivers that appeared to be around in the v4.4 timeframe.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> # SH_MMCIF
Tested-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200903162412.1.Id501e96fa63224f77bb86b2135a5e8324ffb9c43@changeid
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
44 files changed:
drivers/mmc/host/android-goldfish.c
drivers/mmc/host/atmel-mci.c
drivers/mmc/host/au1xmmc.c
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/dw_mmc-exynos.c
drivers/mmc/host/dw_mmc-k3.c
drivers/mmc/host/dw_mmc-pltfm.c
drivers/mmc/host/dw_mmc-rockchip.c
drivers/mmc/host/jz4740_mmc.c
drivers/mmc/host/moxart-mmc.c
drivers/mmc/host/mtk-sd.c
drivers/mmc/host/mvsdio.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/mxs-mmc.c
drivers/mmc/host/omap.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/pxamci.c
drivers/mmc/host/rtsx_pci_sdmmc.c
drivers/mmc/host/rtsx_usb_sdmmc.c
drivers/mmc/host/s3cmci.c
drivers/mmc/host/sdhci-acpi.c
drivers/mmc/host/sdhci-bcm-kona.c
drivers/mmc/host/sdhci-cns3xxx.c
drivers/mmc/host/sdhci-dove.c
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/mmc/host/sdhci-iproc.c
drivers/mmc/host/sdhci-of-arasan.c
drivers/mmc/host/sdhci-of-at91.c
drivers/mmc/host/sdhci-of-esdhc.c
drivers/mmc/host/sdhci-of-hlwd.c
drivers/mmc/host/sdhci-pxav2.c
drivers/mmc/host/sdhci-pxav3.c
drivers/mmc/host/sdhci-s3c.c
drivers/mmc/host/sdhci-sirf.c
drivers/mmc/host/sdhci-spear.c
drivers/mmc/host/sdhci-st.c
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sdhci_f_sdh30.c
drivers/mmc/host/sh_mmcif.c
drivers/mmc/host/sunxi-mmc.c
drivers/mmc/host/tmio_mmc.c
drivers/mmc/host/usdhi6rol0.c
drivers/mmc/host/wbsd.c
drivers/mmc/host/wmt-sdmmc.c

index ceb4924..e878fdf 100644 (file)
@@ -537,6 +537,7 @@ static struct platform_driver goldfish_mmc_driver = {
        .remove         = goldfish_mmc_remove,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 };
 
index 3fc3bbe..444bd3a 100644 (file)
@@ -2668,6 +2668,7 @@ static struct platform_driver atmci_driver = {
        .remove         = atmci_remove,
        .driver         = {
                .name           = "atmel_mci",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(atmci_dt_ids),
                .pm             = &atmci_dev_pm_ops,
        },
index 9bb1910..bd00515 100644 (file)
@@ -1189,6 +1189,7 @@ static struct platform_driver au1xmmc_driver = {
        .resume        = au1xmmc_resume,
        .driver        = {
                .name  = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 };
 
index 66d740e..90cd179 100644 (file)
@@ -1395,6 +1395,7 @@ static const struct dev_pm_ops davinci_mmcsd_pm = {
 static struct platform_driver davinci_mmcsd_driver = {
        .driver         = {
                .name   = "davinci_mmc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = davinci_mmcsd_pm_ops,
                .of_match_table = davinci_mmc_dt_ids,
        },
index 95adeee..0c75810 100644 (file)
@@ -592,6 +592,7 @@ static struct platform_driver dw_mci_exynos_pltfm_driver = {
        .remove         = dw_mci_exynos_remove,
        .driver         = {
                .name           = "dwmmc_exynos",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_exynos_match,
                .pm             = &dw_mci_exynos_pmops,
        },
index db1a84b..29d2494 100644 (file)
@@ -473,6 +473,7 @@ static struct platform_driver dw_mci_k3_pltfm_driver = {
        .remove         = dw_mci_pltfm_remove,
        .driver         = {
                .name           = "dwmmc_k3",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_k3_match,
                .pm             = &dw_mci_k3_dev_pm_ops,
        },
index 7de37f5..73731cd 100644 (file)
@@ -98,6 +98,7 @@ static struct platform_driver dw_mci_pltfm_driver = {
        .remove         = dw_mci_pltfm_remove,
        .driver         = {
                .name           = "dw_mmc",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_pltfm_match,
                .pm             = &dw_mci_pltfm_pmops,
        },
index d4d0213..753502c 100644 (file)
@@ -383,6 +383,7 @@ static struct platform_driver dw_mci_rockchip_pltfm_driver = {
        .remove         = dw_mci_rockchip_remove,
        .driver         = {
                .name           = "dwmmc_rockchip",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = dw_mci_rockchip_match,
                .pm             = &dw_mci_rockchip_dev_pm_ops,
        },
index fea0a42..a1f92fe 100644 (file)
@@ -1124,6 +1124,7 @@ static struct platform_driver jz4740_mmc_driver = {
        .remove = jz4740_mmc_remove,
        .driver = {
                .name = "jz4740-mmc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(jz4740_mmc_of_match),
                .pm = pm_ptr(&jz4740_mmc_pm_ops),
        },
index fc6b9cf..2bfb376 100644 (file)
@@ -717,6 +717,7 @@ static struct platform_driver moxart_mmc_driver = {
        .remove     = moxart_remove,
        .driver     = {
                .name           = "mmc-moxart",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = moxart_mmc_match,
        },
 };
index ed2b246..691c928 100644 (file)
@@ -2689,6 +2689,7 @@ static struct platform_driver mt_msdc_driver = {
        .remove = msdc_drv_remove,
        .driver = {
                .name = "mtk-msdc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = msdc_of_ids,
                .pm = &msdc_dev_pm_ops,
        },
index cc0752a..629efbe 100644 (file)
@@ -824,6 +824,7 @@ static struct platform_driver mvsd_driver = {
        .remove         = mvsd_remove,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = mvsdio_dt_ids,
        },
 };
index b3d654c..12ee072 100644 (file)
@@ -1244,6 +1244,7 @@ static struct platform_driver mxcmci_driver = {
        .id_table       = mxcmci_devtype,
        .driver         = {
                .name           = DRIVER_NAME,
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &mxcmci_pm_ops,
                .of_match_table = mxcmci_of_match,
        }
index b1820de..75007f6 100644 (file)
@@ -726,6 +726,7 @@ static struct platform_driver mxs_mmc_driver = {
        .id_table       = mxs_ssp_ids,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &mxs_mmc_pm_ops,
                .of_match_table = mxs_mmc_dt_ids,
        },
index 33d7af7..6aa0537 100644 (file)
@@ -1504,6 +1504,7 @@ static struct platform_driver mmc_omap_driver = {
        .remove         = mmc_omap_remove,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(mmc_omap_match),
        },
 };
index d02983e..aa9cc49 100644 (file)
@@ -2165,6 +2165,7 @@ static struct platform_driver omap_hsmmc_driver = {
        .remove         = omap_hsmmc_remove,
        .driver         = {
                .name = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm = &omap_hsmmc_dev_pm_ops,
                .of_match_table = of_match_ptr(omap_mmc_of_match),
        },
index 3a93334..29f6180 100644 (file)
@@ -811,6 +811,7 @@ static struct platform_driver pxamci_driver = {
        .remove         = pxamci_remove,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(pxa_mmc_dt_ids),
        },
 };
index 2763a37..eb395e1 100644 (file)
@@ -1471,6 +1471,7 @@ static struct platform_driver rtsx_pci_sdmmc_driver = {
        .id_table       = rtsx_pci_sdmmc_ids,
        .driver         = {
                .name   = DRV_NAME_RTSX_PCI_SDMMC,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 };
 module_platform_driver(rtsx_pci_sdmmc_driver);
index 7225d93..598f495 100644 (file)
@@ -1458,6 +1458,7 @@ static struct platform_driver rtsx_usb_sdmmc_driver = {
        .id_table       = rtsx_usb_sdmmc_ids,
        .driver         = {
                .name   = "rtsx_usb_sdmmc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &rtsx_usb_sdmmc_dev_pm_ops,
        },
 };
index a725fb1..e3698ab 100644 (file)
@@ -1804,6 +1804,7 @@ MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids);
 static struct platform_driver s3cmci_driver = {
        .driver = {
                .name   = "s3c-sdi",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = s3cmci_dt_match,
        },
        .id_table       = s3cmci_driver_ids,
index 284cba1..fc41d04 100644 (file)
@@ -1027,6 +1027,7 @@ static const struct dev_pm_ops sdhci_acpi_pm_ops = {
 static struct platform_driver sdhci_acpi_driver = {
        .driver = {
                .name                   = "sdhci-acpi",
+               .probe_type             = PROBE_PREFER_ASYNCHRONOUS,
                .acpi_match_table       = sdhci_acpi_ids,
                .pm                     = &sdhci_acpi_pm_ops,
        },
index a6c2bd2..4d4aac8 100644 (file)
@@ -324,6 +324,7 @@ err_pltfm_free:
 static struct platform_driver sdhci_bcm_kona_driver = {
        .driver         = {
                .name   = "sdhci-kona",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pltfm_pmops,
                .of_match_table = sdhci_bcm_kona_of_match,
        },
index 811eab1..2a29c7a 100644 (file)
@@ -98,6 +98,7 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev)
 static struct platform_driver sdhci_cns3xxx_driver = {
        .driver         = {
                .name   = "sdhci-cns3xxx",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = sdhci_cns3xxx_probe,
index fe9da31..5e5bf82 100644 (file)
@@ -105,6 +105,7 @@ MODULE_DEVICE_TABLE(of, sdhci_dove_of_match_table);
 static struct platform_driver sdhci_dove_driver = {
        .driver         = {
                .name   = "sdhci-dove",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pltfm_pmops,
                .of_match_table = sdhci_dove_of_match_table,
        },
index a2eb36c..62b3d47 100644 (file)
@@ -1925,6 +1925,7 @@ static const struct dev_pm_ops sdhci_esdhc_pmops = {
 static struct platform_driver sdhci_esdhc_imx_driver = {
        .driver         = {
                .name   = "sdhci-esdhc-imx",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = imx_esdhc_dt_ids,
                .pm     = &sdhci_esdhc_pmops,
        },
index b540aa6..c9434b4 100644 (file)
@@ -369,6 +369,7 @@ err:
 static struct platform_driver sdhci_iproc_driver = {
        .driver = {
                .name = "sdhci-iproc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_iproc_of_match,
                .acpi_match_table = ACPI_PTR(sdhci_iproc_acpi_ids),
                .pm = &sdhci_pltfm_pmops,
index 3aea46d..829ccef 100644 (file)
@@ -1693,6 +1693,7 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
 static struct platform_driver sdhci_arasan_driver = {
        .driver = {
                .name = "sdhci-arasan",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_arasan_of_match,
                .pm = &sdhci_arasan_dev_pm_ops,
        },
index 1ece2c5..5564d7b 100644 (file)
@@ -465,6 +465,7 @@ static int sdhci_at91_remove(struct platform_device *pdev)
 static struct platform_driver sdhci_at91_driver = {
        .driver         = {
                .name   = "sdhci-at91",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_at91_dt_match,
                .pm     = &sdhci_at91_dev_pm_ops,
        },
index 45881b3..3a3340c 100644 (file)
@@ -1468,6 +1468,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
 static struct platform_driver sdhci_esdhc_driver = {
        .driver = {
                .name = "sdhci-esdhc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_esdhc_of_match,
                .pm = &esdhc_of_dev_pm_ops,
        },
index da844a3..1267579 100644 (file)
@@ -80,6 +80,7 @@ MODULE_DEVICE_TABLE(of, sdhci_hlwd_of_match);
 static struct platform_driver sdhci_hlwd_driver = {
        .driver = {
                .name = "sdhci-hlwd",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_hlwd_of_match,
                .pm = &sdhci_pltfm_pmops,
        },
index 9282bc4..f18906b 100644 (file)
@@ -226,6 +226,7 @@ free:
 static struct platform_driver sdhci_pxav2_driver = {
        .driver         = {
                .name   = "sdhci-pxav2",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(sdhci_pxav2_of_match),
                .pm     = &sdhci_pltfm_pmops,
        },
index e55037c..a6d89a3 100644 (file)
@@ -567,6 +567,7 @@ static const struct dev_pm_ops sdhci_pxav3_pmops = {
 static struct platform_driver sdhci_pxav3_driver = {
        .driver         = {
                .name   = "sdhci-pxav3",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(sdhci_pxav3_of_match),
                .pm     = &sdhci_pxav3_pmops,
        },
index 080ced1..cb5f87b 100644 (file)
@@ -784,6 +784,7 @@ static struct platform_driver sdhci_s3c_driver = {
        .id_table       = sdhci_s3c_driver_ids,
        .driver         = {
                .name   = "s3c-sdhci",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(sdhci_s3c_dt_match),
                .pm     = &sdhci_s3c_pmops,
        },
index f4b05dd..e9b347b 100644 (file)
@@ -220,6 +220,7 @@ MODULE_DEVICE_TABLE(of, sdhci_sirf_of_match);
 static struct platform_driver sdhci_sirf_driver = {
        .driver         = {
                .name   = "sdhci-sirf",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_sirf_of_match,
                .pm     = &sdhci_pltfm_pmops,
        },
index b4b6308..d463e2f 100644 (file)
@@ -181,6 +181,7 @@ MODULE_DEVICE_TABLE(of, sdhci_spear_id_table);
 static struct platform_driver sdhci_driver = {
        .driver = {
                .name   = "sdhci",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pm_ops,
                .of_match_table = of_match_ptr(sdhci_spear_id_table),
        },
index 1301ceb..4e9ff3e 100644 (file)
@@ -521,6 +521,7 @@ static struct platform_driver sdhci_st_driver = {
        .remove = sdhci_st_remove,
        .driver = {
                   .name = "sdhci-st",
+                  .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                   .pm = &sdhci_st_pmops,
                   .of_match_table = of_match_ptr(st_sdhci_match),
                  },
index 428cdc5..ed12aac 100644 (file)
@@ -1782,6 +1782,7 @@ static SIMPLE_DEV_PM_OPS(sdhci_tegra_dev_pm_ops, sdhci_tegra_suspend,
 static struct platform_driver sdhci_tegra_driver = {
        .driver         = {
                .name   = "sdhci-tegra",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_tegra_dt_match,
                .pm     = &sdhci_tegra_dev_pm_ops,
        },
index 4625cc0..3f59779 100644 (file)
@@ -219,6 +219,7 @@ MODULE_DEVICE_TABLE(acpi, f_sdh30_acpi_ids);
 static struct platform_driver sdhci_f_sdh30_driver = {
        .driver = {
                .name = "f_sdh30",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(f_sdh30_dt_ids),
                .acpi_match_table = ACPI_PTR(f_sdh30_acpi_ids),
                .pm     = &sdhci_pltfm_pmops,
index 9f53634..e5e4570 100644 (file)
@@ -1562,6 +1562,7 @@ static struct platform_driver sh_mmcif_driver = {
        .remove         = sh_mmcif_remove,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sh_mmcif_dev_pm_ops,
                .of_match_table = sh_mmcif_of_match,
        },
index 5e95bbc..fc62773 100644 (file)
@@ -1514,6 +1514,7 @@ static const struct dev_pm_ops sunxi_mmc_pm_ops = {
 static struct platform_driver sunxi_mmc_driver = {
        .driver = {
                .name   = "sunxi-mmc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(sunxi_mmc_of_match),
                .pm = &sunxi_mmc_pm_ops,
        },
index 757c901..d2d3b8d 100644 (file)
@@ -213,6 +213,7 @@ static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
 static struct platform_driver tmio_mmc_driver = {
        .driver = {
                .name = "tmio-mmc",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm = &tmio_mmc_dev_pm_ops,
        },
        .probe = tmio_mmc_probe,
index 7666c90..e2d5112 100644 (file)
@@ -1890,6 +1890,7 @@ static struct platform_driver usdhi6_driver = {
        .remove         = usdhi6_remove,
        .driver         = {
                .name   = "usdhi6rol0",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = usdhi6_of_match,
        },
 };
index 67f917d..cd63ea8 100644 (file)
@@ -1905,6 +1905,7 @@ static struct platform_driver wbsd_driver = {
        .resume         = wbsd_platform_resume,
        .driver         = {
                .name   = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 };
 
index 2c4ba1f..cf10949 100644 (file)
@@ -990,6 +990,7 @@ static struct platform_driver wmt_mci_driver = {
        .remove = wmt_mci_remove,
        .driver = {
                .name = DRIVER_NAME,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm = wmt_mci_pm_ops,
                .of_match_table = wmt_mci_dt_ids,
        },