Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527a4871 authored by Jonas Gorski's avatar Jonas Gorski Committed by David S. Miller
Browse files

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: default avatarJonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6213c1f

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+2 −7
Original line number Diff line number Diff line
@@ -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);