From 69449862f7228825d63a6198e2d873969e3ee6c6 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 12 Apr 2004 17:32:24 -0700 Subject: [PATCH] [PATCH] Amiga eth%d Amiga Ethernet drivers: Print card info after calling register_netdev(), to avoid dev->name still being 'eth%d'. --- drivers/net/a2065.c | 10 +++++----- drivers/net/ariadne.c | 10 +++++----- drivers/net/hydra.c | 10 ++++++---- drivers/net/zorro8390.c | 17 ++++++++++------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index 233c9ec46e51..13d0790e4818 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c @@ -764,11 +764,6 @@ static int __devinit a2065_init_one(struct zorro_dev *z, dev->dev_addr[3] = (z->rom.er_SerialNumber>>16) & 0xff; dev->dev_addr[4] = (z->rom.er_SerialNumber>>8) & 0xff; dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; - printk("%s: A2065 at 0x%08lx, Ethernet Address " - "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board, - dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], - dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); - dev->base_addr = ZTWO_VADDR(base_addr); dev->mem_start = ZTWO_VADDR(mem_start); dev->mem_end = dev->mem_start+A2065_RAM_SIZE; @@ -807,6 +802,11 @@ static int __devinit a2065_init_one(struct zorro_dev *z, } zorro_set_drvdata(z, dev); + printk("%s: A2065 at 0x%08lx, Ethernet Address " + "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board, + dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], + dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); + return 0; } diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 5072f4c749b9..d10c3ffaa25f 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -195,11 +195,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, dev->dev_addr[3] = (z->rom.er_SerialNumber>>16) & 0xff; dev->dev_addr[4] = (z->rom.er_SerialNumber>>8) & 0xff; dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; - printk("%s: Ariadne at 0x%08lx, Ethernet Address " - "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board, - dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], - dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); - dev->base_addr = ZTWO_VADDR(base_addr); dev->mem_start = ZTWO_VADDR(mem_start); dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE; @@ -221,6 +216,11 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, } zorro_set_drvdata(z, dev); + printk("%s: Ariadne at 0x%08lx, Ethernet Address " + "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board, + dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], + dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); + return 0; } diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index 9aad835e4bfd..e8a556f98c8d 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c @@ -123,10 +123,6 @@ static int __devinit hydra_init(struct zorro_dev *z) return -EAGAIN; } - printk("%s: hydra at 0x%08lx, address %02x:%02x:%02x:%02x:%02x:%02x (hydra.c " HYDRA_VERSION ")\n", dev->name, z->resource.start, - dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], - dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); - ei_status.name = name; ei_status.tx_start_page = start_page; ei_status.stop_page = stop_page; @@ -156,6 +152,12 @@ static int __devinit hydra_init(struct zorro_dev *z) } zorro_set_drvdata(z, dev); + + printk("%s: Hydra at 0x%08lx, address %02x:%02x:%02x:%02x:%02x:%02x " + "(hydra.c " HYDRA_VERSION ")\n", dev->name, z->resource.start, + dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], + dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); + return 0; } diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c index 0889e3d66ff9..0afd0c2ef423 100644 --- a/drivers/net/zorro8390.c +++ b/drivers/net/zorro8390.c @@ -208,11 +208,6 @@ static int __devinit zorro8390_init(struct net_device *dev, dev->dev_addr[i] = SA_prom[i]; } - printk("%s: %s at 0x%08lx, Ethernet Address " - "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, name, board, - dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], - dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); - ei_status.name = name; ei_status.tx_start_page = start_page; ei_status.stop_page = stop_page; @@ -233,9 +228,17 @@ static int __devinit zorro8390_init(struct net_device *dev, NS8390_init(dev, 0); err = register_netdev(dev); - if (err) + if (err) { free_irq(IRQ_AMIGA_PORTS, dev); - return err; + return err; + } + + printk("%s: %s at 0x%08lx, Ethernet Address " + "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, name, board, + dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], + dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); + + return 0; } static int zorro8390_open(struct net_device *dev) -- 2.39.5