OpenWrt – Blame information for rev 2
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From 71710bb6cbc82f411a4e5faafa0c3178e48e7137 Mon Sep 17 00:00:00 2001 |
2 | From: Jonas Gorski <jonas.gorski@gmail.com> |
||
3 | Date: Tue, 30 May 2017 13:31:45 +0200 |
||
4 | Subject: [PATCH 3/6] bcm63xx_enet: do not rely on probe order |
||
5 | |||
6 | Do not rely on the shared device being probed before the enet(sw) |
||
7 | devices. This makes it easier to eventually move out the shared |
||
8 | device as a dma controller driver (what it should be). |
||
9 | |||
10 | Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> |
||
11 | --- |
||
12 | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 ++------- |
||
13 | 1 file changed, 2 insertions(+), 7 deletions(-) |
||
14 | |||
15 | --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
||
16 | +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
||
17 | @@ -1739,10 +1739,8 @@ static int bcm_enet_probe(struct platfor |
||
18 | const char *clk_name; |
||
19 | int i, ret; |
||
20 | |||
21 | - /* stop if shared driver failed, assume driver->probe will be |
||
22 | - * called in the same order we register devices (correct ?) */ |
||
23 | if (!bcm_enet_shared_base[0]) |
||
24 | - return -ENODEV; |
||
25 | + return -EPROBE_DEFER; |
||
26 | |||
27 | res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
||
28 | res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); |
||
29 | @@ -2714,11 +2712,8 @@ static int bcm_enetsw_probe(struct platf |
||
30 | struct resource *res_mem; |
||
31 | int ret, irq_rx, irq_tx; |
||
32 | |||
33 | - /* stop if shared driver failed, assume driver->probe will be |
||
34 | - * called in the same order we register devices (correct ?) |
||
35 | - */ |
||
36 | if (!bcm_enet_shared_base[0]) |
||
37 | - return -ENODEV; |
||
38 | + return -EPROBE_DEFER; |
||
39 | |||
40 | res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
||
41 | irq_rx = platform_get_irq(pdev, 0); |