diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2018-01-13 17:37:13 -0500 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert@linux-m68k.org> | 2018-01-16 16:47:29 +0100 |
| commit | 41b848160eabb22957652936b66ccafd95ab5ad8 (patch) | |
| tree | f38449c4f4a4694f6c3215262919dc45c92aeb24 /drivers/net/ethernet/cirrus/mac89x0.c | |
| parent | nubus: Rename struct nubus_dev (diff) | |
| download | linux-dev-41b848160eabb22957652936b66ccafd95ab5ad8.tar.xz linux-dev-41b848160eabb22957652936b66ccafd95ab5ad8.zip | |
nubus: Adopt standard linked list implementation
This increases code re-use and improves readability.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/net/ethernet/cirrus/mac89x0.c')
| -rw-r--r-- | drivers/net/ethernet/cirrus/mac89x0.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c index f910f0f386d6..977d4c2c759d 100644 --- a/drivers/net/ethernet/cirrus/mac89x0.c +++ b/drivers/net/ethernet/cirrus/mac89x0.c @@ -187,6 +187,7 @@ struct net_device * __init mac89x0_probe(int unit) unsigned long ioaddr; unsigned short sig; int err = -ENODEV; + struct nubus_rsrc *fres; if (!MACH_IS_MAC) return ERR_PTR(-ENODEV); @@ -207,8 +208,9 @@ struct net_device * __init mac89x0_probe(int unit) /* We might have to parameterize this later */ slot = 0xE; /* Get out now if there's a real NuBus card in slot E */ - if (nubus_find_slot(slot, NULL) != NULL) - goto out; + for_each_func_rsrc(fres) + if (fres->board->slot == slot) + goto out; /* The pseudo-ISA bits always live at offset 0x300 (gee, wonder why...) */ |