Merge tag 'ntb-5.15' of git://github.com/jonmason/ntb

[linux-2.6-microblaze.git] / drivers / mmc / host / bcm2835.c

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index a076779..8c2361e 100644 (file)
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -1406,9 +1406,7 @@ static int bcm2835_probe(struct platform_device *pdev)
 
        clk = devm_clk_get(dev, NULL);
        if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "could not get clk: %d\n", ret);
+               ret = dev_err_probe(dev, PTR_ERR(clk), "could not get clk\n");
                goto err;
        }
 
@@ -1476,6 +1474,7 @@ static struct platform_driver bcm2835_driver = {
        .remove     = bcm2835_remove,
        .driver     = {
                .name           = "sdhost-bcm2835",
+               .probe_type     = PROBE_PREFER_ASYNCHRONOUS,
                .of_match_table = bcm2835_match,
        },
 };