The patch titled smc-ultra: get rid of "eth%d" message has been removed from the -mm tree. Its filename was smc-ultra-get-rid-of-eth%d-message.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: smc-ultra: get rid of "eth%d" message From: Márton Németh <nm127@xxxxxxxxxxx> 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 <nm127@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/smc-ultra.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff -puN drivers/net/smc-ultra.c~smc-ultra-get-rid-of-eth%d-message drivers/net/smc-ultra.c --- a/drivers/net/smc-ultra.c~smc-ultra-get-rid-of-eth%d-message +++ a/drivers/net/smc-ultra.c @@ -227,9 +227,6 @@ static int __init ultra_probe1(struct ne for (i = 0; i < 6; i++) dev->dev_addr[i] = inb(ioaddr + 8 + i); - printk("%s: %s at %#3x, %pM", dev->name, model_name, - ioaddr, dev->dev_addr); - /* Switch from the station address to the alternate register set and read the useful registers there. */ outb(0x80 | reg4, ioaddr + 4); @@ -252,8 +249,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; @@ -279,22 +278,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; @@ -310,6 +306,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); _ Patches currently in -mm which might be from nm127@xxxxxxxxxxx are smc-ultra-get-rid-of-eth%d-message.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html