smc-ultra: get rid of "eth%d" message
Subsystems (2)
PATCH 1/1 smc-ultra: get rid of "eth%d" message
Print out the dev->name only after register_netdev(). If the dev->name is printk()ed out before calling register_netdev() the result will be "eth%d" in the dmesg instead of "eth0".
Signed-off-by Márton Németh <[email protected]>
---
drivers/net/smc-ultra.c renamed from drivers/net/smc-ultra.c.orig +22 -11
@@ -228,9 +228,6 @@ static int __init ultra_probe1(struct nefor (i =0 ; i <6 ; i++) dev->dev_addr[i] =inb (ioaddr +8 + i); -printk ("%s: %s at %#3x, %s" , dev->name, model_name, - ioaddr,print_mac (mac, dev->dev_addr)); -/* Switch from the station address to the alternate register set and read the useful registers there. */ outb (0x80 | reg4, ioaddr +4 );
@@ -253,8 +250,10 @@ static int __init ultra_probe1(struct ne irq = irqmap[((irqreg &0x40 ) >>4 ) + ((irqreg &0x0c ) >>2 )];if (irq ==0 ) { -printk (", failed to detect IRQ line.\n" ); - retval = -EAGAIN ; +printk (KERN_ERR "%s at %#3x, %s, " +"failed to detect IRQ line.\n" , model_name, + ioaddr,print_mac (mac, dev->dev_addr)); + retval = -EAGAIN ; goto out; } dev->irq = irq;
@@ -280,22 +279,19 @@ static int __init ultra_probe1(struct ne ei_status.mem =ioremap (dev->mem_start, (ei_status.stop_page -START_PG )*256 );if (!ei_status.mem) { -printk (", failed to ioremap.\n" ); - retval = -ENOMEM ; +printk (KERN_ERR "%s at %#3x, %s, failed to ioremap.\n" , + model_name, ioaddr,print_mac (mac, dev->dev_addr)); + retval = -ENOMEM ; goto out; } dev->mem_end = dev->mem_start + (ei_status.stop_page -START_PG )*256 ;if (piomode) { -printk (",%s IRQ %d programmed-I/O mode.\n" , - eeprom_irq ?"EEPROM" :"assigned " , dev->irq); ei_status.block_input = &ultra_pio_input; ei_status.block_output = &ultra_pio_output; ei_status.get_8390_hdr = &ultra_pio_get_hdr; }else { -printk (",%s IRQ %d memory %#lx-%#lx.\n" , eeprom_irq ?"" :"assigned " , - dev->irq, dev->mem_start, dev->mem_end-1 ); ei_status.block_input = &ultra_block_input; ei_status.block_output = &ultra_block_output; ei_status.get_8390_hdr = &ultra_get_8390_hdr;
@@ -311,6 +307,21 @@ static int __init ultra_probe1(struct ne retval =register_netdev (dev);if (retval) goto out; + +if (piomode) { +printk (KERN_INFO "%s: %s at %#3x, %s," +"%s IRQ %d programmed-I/O mode.\n" , + dev->name, model_name, ioaddr, +print_mac (mac, dev->dev_addr), + eeprom_irq ?" EEPROM" :" assigned" , dev->irq); + }else { +printk (KERN_INFO "%s: %s at %#3x, %s," +"%s IRQ %d memory %#lx-%#lx.\n" , + dev->name, model_name, ioaddr, +print_mac (mac, dev->dev_addr), + eeprom_irq ?"" :" assigned" , + dev->irq, dev->mem_start, dev->mem_end-1 ); + }return 0 ; out:release_region (ioaddr,ULTRA_IO_EXTENT );