diff -urN /mnt/disk/linux/drivers/net/e2100.c /linux/drivers/net/e2100.c --- /mnt/disk/linux/drivers/net/e2100.c Thu Nov 16 22:57:16 2000 +++ /linux/drivers/net/e2100.c Sun Nov 19 20:04:48 2000 @@ -140,8 +140,8 @@ unsigned char *station_addr = dev->dev_addr; static unsigned version_printed = 0; - if (!request_region(ioaddr, E21_IO_EXTENT, "e2100")) - return -ENODEV; + if (!request_region(ioaddr, E21_IO_EXTENT, dev->name)) + return -EBUSY; /* First check the station address for the Ctron prefix. */ if (inb(ioaddr + E21_SAPROM + 0) != 0x00 @@ -168,7 +168,7 @@ outb(0, ioaddr + E21_ASIC); /* and disable the secondary interface. */ if (ei_debug && version_printed++ == 0) - printk(version); + printk(KERN_INFO "%s", version); for (i = 0; i < 6; i++) printk(" %02X", station_addr[i]); @@ -254,10 +254,12 @@ static int e21_open(struct net_device *dev) { + int retval; short ioaddr = dev->base_addr; - if (request_irq(dev->irq, ei_interrupt, 0, "e2100", dev)) { - return -EBUSY; + if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { + printk(KERN_ERR "%s: unable to get IRQ%d.\n", dev->name, dev->irq); + return retval; } /* Set the interrupt line and memory base on the hardware. */ @@ -280,7 +282,7 @@ short ioaddr = dev->base_addr; outb(0x01, ioaddr); - if (ei_debug > 1) printk("resetting the E2180x3 t=%ld...", jiffies); + if (ei_debug > 1) printk(KERN_DEBUG "resetting the E2180x3 t=%ld...", jiffies); ei_status.txing = 0; /* Set up the ASIC registers, just in case something changed them. */ @@ -352,7 +354,7 @@ short ioaddr = dev->base_addr; if (ei_debug > 1) - printk("%s: Shutting down ethercard.\n", dev->name); + printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); free_irq(dev->irq, dev); dev->irq = ei_status.saved_irq;