Propagate the request_irq() return code. Also promote the log level of the failure message. Likewise some other KERN_INFO messages.
Signed-off-by: Finn Thain <[email protected]> Index: linux-2.6.34/drivers/net/mac8390.c =================================================================== --- linux-2.6.34.orig/drivers/net/mac8390.c 2010-05-28 00:27:30.000000000 +1000 +++ linux-2.6.34/drivers/net/mac8390.c 2010-05-28 00:27:32.000000000 +1000 @@ -556,7 +556,7 @@ static int __init mac8390_initdev(struct case MAC8390_APPLE: switch (mac8390_testio(dev->mem_start)) { case ACCESS_UNKNOWN: - pr_info("Don't know how to access card memory!\n"); + pr_err("Don't know how to access card memory!\n"); return -ENODEV; break; @@ -643,10 +643,13 @@ static int __init mac8390_initdev(struct static int mac8390_open(struct net_device *dev) { + int err; + __ei_open(dev); - if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) { - pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq); - return -EAGAIN; + err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev); + if (err) { + pr_err("%s: unable to get IRQ %d\n", dev->name, dev->irq); + return err; } return 0; } @@ -662,7 +665,7 @@ static void mac8390_no_reset(struct net_ { ei_status.txing = 0; if (ei_debug > 1) - pr_info("reset not supported\n"); + printk(KERN_DEBUG pr_fmt("reset not supported\n")); return; } @@ -670,7 +673,7 @@ static void interlan_reset(struct net_de { unsigned char *target = nubus_slot_addr(IRQ2SLOT(dev->irq)); if (ei_debug > 1) - pr_info("Need to reset the NS8390 t=%lu...", jiffies); + printk(KERN_DEBUG pr_fmt("Need to reset the NS8390 t=%lu..."), jiffies); ei_status.txing = 0; target[0xC0000] = 0; if (ei_debug > 1) @@ -871,5 +874,3 @@ static void word_memcpy_fromcard(void *t while (count--) *to++ = *from++; } - - -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
