On Mon, Feb 12, 2018 at 4:08 AM, Finn Thain <[email protected]> wrote:
> This resolves an old bug that constrained this driver to no more than
> one card.
>
> Tested-by: Stan Johnson <[email protected]>
> Signed-off-by: Finn Thain <[email protected]>
> --- a/drivers/net/ethernet/8390/mac8390.c
> +++ b/drivers/net/ethernet/8390/mac8390.c
> @@ -390,86 +389,86 @@ static bool __init mac8390_init(struct net_device *dev,
> return true;
> }
>
> -struct net_device * __init mac8390_probe(int unit)
> +static int mac8390_device_probe(struct nubus_board *board)
> {
> struct net_device *dev;
> - struct nubus_rsrc *ndev = NULL;
> int err = -ENODEV;
> - static unsigned int slots;
> -
> - enum mac8390_type cardtype;
> -
> - /* probably should check for Nubus instead */
> + struct nubus_rsrc *fres;
> + enum mac8390_type cardtype = MAC8390_NONE;
>
> if (!MACH_IS_MAC)
> - return ERR_PTR(-ENODEV);
> + return -ENODEV;
I think this check can be removed completely, as the nubus_board will
exist on suitable Macs only.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
