bcm63xx_enet: do not rely on probe order

Do not rely on the shared device being probed before the enet(sw)
devices. This makes it easier to eventually move out the shared
device as a dma controller driver (what it should be).

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index a1e1e12e187a506c86c8b529e7df473b7483e5c8..8caf6abab3a6c8e8dab394d313438d275c5e0454 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1722,10 +1722,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
        const char *clk_name;
        int i, ret;
 
-       /* stop if shared driver failed, assume driver->probe will be
-        * called in the same order we register devices (correct ?) */
        if (!bcm_enet_shared_base[0])
-               return -ENODEV;
+               return -EPROBE_DEFER;
 
        res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
@@ -2696,11 +2694,8 @@ static int bcm_enetsw_probe(struct platform_device *pdev)
        struct resource *res_mem;
        int ret, irq_rx, irq_tx;
 
-       /* stop if shared driver failed, assume driver->probe will be
-        * called in the same order we register devices (correct ?)
-        */
        if (!bcm_enet_shared_base[0])
-               return -ENODEV;
+               return -EPROBE_DEFER;
 
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq_rx = platform_get_irq(pdev, 0);