mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v5.4

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 v5.4 timeframe.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20200903162412.5.I2b630c4d40ff4ea61d5b30b8ccfe95890e257100@changeid
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c
index 026ca91..bfb8efe 100644 (file)
--- a/drivers/mmc/host/alcor.c
+++ b/drivers/mmc/host/alcor.c
@@ -1178,6 +1178,7 @@ static struct platform_driver alcor_pci_sdmmc_driver = {
        .id_table       = alcor_pci_sdmmc_ids,
        .driver         = {
                .name   = DRV_NAME_ALCOR_PCI_SDMMC,
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &alcor_mmc_pm_ops
        },
 };

diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index a1bcc0f..4f008ba 100644 (file)
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -240,6 +240,7 @@ static const struct of_device_id aspeed_sdhci_of_match[] = {
 static struct platform_driver aspeed_sdhci_driver = {
        .driver         = {
                .name   = "sdhci-aspeed",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = aspeed_sdhci_of_match,
        },
        .probe          = aspeed_sdhci_probe,
@@ -318,6 +319,7 @@ MODULE_DEVICE_TABLE(of, aspeed_sdc_of_match);
 static struct platform_driver aspeed_sdc_driver = {
        .driver         = {
                .name   = "sd-controller-aspeed",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .pm     = &sdhci_pltfm_pmops,
                .of_match_table = aspeed_sdc_of_match,
        },

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index bafa2e4..1efaf60 100644 (file)
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -787,6 +787,7 @@ static struct platform_driver sdhci_sprd_driver = {
        .remove = sdhci_sprd_remove,
        .driver = {
                .name = "sdhci_sprd_r11",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = of_match_ptr(sdhci_sprd_of_match),
                .pm = &sdhci_sprd_pm_ops,
        },

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index c5f4719..a4c6d9d 100644 (file)
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -745,6 +745,7 @@ static int sdhci_am654_remove(struct platform_device *pdev)
 static struct platform_driver sdhci_am654_driver = {
        .driver = {
                .name = "sdhci-am654",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = sdhci_am654_of_match,
        },
        .probe = sdhci_am654_probe,

diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
index 55efd5c..3092466 100644 (file)
--- a/drivers/mmc/host/uniphier-sd.c
+++ b/drivers/mmc/host/uniphier-sd.c
@@ -685,6 +685,7 @@ static struct platform_driver uniphier_sd_driver = {
        .remove = uniphier_sd_remove,
        .driver = {
                .name = "uniphier-sd",
+               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = uniphier_sd_match,
        },
 };