Commit 0795af57 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF() 



This is nicer than the MAC_FMT stuff.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95ea3627

drivers/net/3c503.c

+3 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ el2_probe1(struct net_device *dev, int ioaddr) 
    int i, iobase_reg, membase_reg, saved_406, wordlength, retval;

    static unsigned version_printed;

    unsigned long vendor_id;

    DECLARE_MAC_BUF(mac);



    if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME))

	return -EBUSY;
@@ -226,7 +227,8 @@ el2_probe1(struct net_device *dev, int ioaddr) 


    /* Retrieve and print the ethernet address. */

    for (i = 0; i < 6; i++)

	printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i));

	dev->dev_addr[i] = inb(ioaddr + i);

    printk("%s", print_mac(mac, dev->dev_addr));



    /* Map the 8390 back into the window. */

    outb(ECNTRL_THIN, ioaddr + 0x406);

drivers/net/3c505.c

+5 −5
Original line number Diff line number Diff line
@@ -1386,6 +1386,7 @@ static int __init elplus_setup(struct net_device *dev) 
	unsigned long timeout;

	unsigned long cookie = 0;

	int err = -ENODEV;

	DECLARE_MAC_BUF(mac);



	/*

	 *  setup adapter structure
@@ -1521,11 +1522,10 @@ static int __init elplus_setup(struct net_device *dev) 
	/*

	 * print remainder of startup message

	 */

	printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, ",

	       dev->name, dev->base_addr, dev->irq, dev->dma);

	printk("addr %02x:%02x:%02x:%02x:%02x:%02x, ",

	       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],

	       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);

	printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, "

	       "addr %s, ",

	       dev->name, dev->base_addr, dev->irq, dev->dma,

	       print_mac(mac, dev->dev_addr));



	/*

	 * read more information from the adapter

drivers/net/3c507.c

+3 −3
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) 
	static unsigned char init_ID_done, version_printed;

	int i, irq, irqval, retval;

	struct net_local *lp;

	DECLARE_MAC_BUF(mac);



	if (init_ID_done == 0) {

		ushort lrs_state = 0xff;
@@ -402,10 +403,9 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) 
	dev->base_addr = ioaddr;



	outb(0x01, ioaddr + MISC_CTRL);

	for (i = 0; i < 6; i++) {

	for (i = 0; i < 6; i++)

		dev->dev_addr[i] = inb(ioaddr + i);

		printk(" %02x", dev->dev_addr[i]);

	}

	printk(" %s", print_mac(mac, dev->dev_addr));



	if (mem_start)

		net_debug = mem_start & 7;

drivers/net/3c509.c

+6 −12
Original line number Diff line number Diff line
@@ -313,8 +313,9 @@ static int nopnp; 
static int __init el3_common_init(struct net_device *dev)

{

	struct el3_private *lp = netdev_priv(dev);

	short i;

	int err;

	DECLARE_MAC_BUF(mac);

	const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};



	spin_lock_init(&lp->lock);
@@ -346,17 +347,10 @@ static int __init el3_common_init(struct net_device *dev) 
		return err;

	}



	{

		const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};

		printk("%s: 3c5x9 found at %#3.3lx, %s port, address ",

			dev->name, dev->base_addr,

			if_names[(dev->if_port & 0x03)]);

	}



	/* Read in the station address. */

	for (i = 0; i < 6; i++)

		printk(" %2.2x", dev->dev_addr[i]);

	printk(", IRQ %d.\n", dev->irq);

	printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, "

	       "address %s, IRQ %d.\n",

	       dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],

	       print_mac(mac, dev->dev_addr), dev->irq);



	if (el3_debug > 0)

		printk(KERN_INFO "%s", version);

drivers/net/3c515.c

+2 −2
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 
	unsigned int eeprom[0x40], checksum = 0;	/* EEPROM contents */

	int i;

	int irq;

	DECLARE_MAC_BUF(mac);



	if (idev) {

		irq = pnp_irq(idev, 0);
@@ -630,8 +631,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 
	checksum = (checksum ^ (checksum >> 8)) & 0xff;

	if (checksum != 0x00)

		printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);

	for (i = 0; i < 6; i++)

		printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);

	printk(" %s", print_mac(mac, dev->dev_addr));

	if (eeprom[16] == 0x11c7) {	/* Corkscrew */

		if (request_dma(dev->dma, "3c515")) {

			printk(", DMA %d allocation failed", dev->dma);