drivers/net/cs89x0.c: compilation warning fix

[linux-2.6-omap-h63xx.git] / drivers / net / atarilance.c

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 8bf548e1cb4e55c1c86ad25a3208e53c57300ec3..b74dbeef805018f2d64f246130239f147fce8191 100644 (file)
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -467,6 +467,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
        int                                     i;
        static int                              did_version;
        unsigned short                  save1, save2;
+       DECLARE_MAC_BUF(mac);
 
        PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
                                  (long)memaddr, (long)ioaddr ));
@@ -595,8 +596,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                i = IO->mem;
                break;
        }
-       for( i = 0; i < 6; ++i )
-               printk( "%02x%s", dev->dev_addr[i], (i < 5) ? ":" : "\n" );
+       printk("%s\n", print_mac(mac, dev->dev_addr));
        if (lp->cardtype == OLD_RIEBL) {
                printk( "%s: Warning: This is a default ethernet address!\n",
                                dev->name );
@@ -779,6 +779,8 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
        int entry, len;
        struct lance_tx_head *head;
        unsigned long flags;
+       DECLARE_MAC_BUF(mac);
+       DECLARE_MAC_BUF(mac2);
 
        DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",
                                  dev->name, DREG ));
@@ -801,17 +803,13 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
 
        /* Fill in a Tx ring entry */
        if (lance_debug >= 3) {
-               u_char *p;
-               int i;
-               printk( "%s: TX pkt type 0x%04x from ", dev->name,
-                               ((u_short *)skb->data)[6]);
-               for( p = &((u_char *)skb->data)[6], i = 0; i < 6; i++ )
-                       printk("%02x%s", *p++, i != 5 ? ":" : "" );
-               printk(" to ");
-               for( p = (u_char *)skb->data, i = 0; i < 6; i++ )
-                       printk("%02x%s", *p++, i != 5 ? ":" : "" );
-               printk(" data at 0x%08x len %d\n", (int)skb->data,
-                          (int)skb->len );
+               printk( "%s: TX pkt type 0x%04x from "
+                               "%s to %s"
+                               " data at 0x%08x len %d\n",
+                               dev->name, ((u_short *)skb->data)[6],
+                               print_mac(mac, &skb->data[6]),
+                               print_mac(mac2, skb->data),
+                               (int)skb->data, (int)skb->len );
        }
 
        /* We're not prepared for the int until the last flags are set/reset. And
@@ -1021,19 +1019,18 @@ static int lance_rx( struct net_device *dev )
                                }
 
                                if (lance_debug >= 3) {
-                                       u_char *data = PKTBUF_ADDR(head), *p;
-                                       printk( "%s: RX pkt type 0x%04x from ", dev->name,
-                                                       ((u_short *)data)[6]);
-                                       for( p = &data[6], i = 0; i < 6; i++ )
-                                               printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                                       printk(" to ");
-                                       for( p = data, i = 0; i < 6; i++ )
-                                               printk("%02x%s", *p++, i != 5 ? ":" : "" );
-                                       printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
+                                       u_char *data = PKTBUF_ADDR(head);
+                                       DECLARE_MAC_BUF(mac);
+                                       DECLARE_MAC_BUF(mac2);
+
+                                       printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s "
+                                                  "data %02x %02x %02x %02x %02x %02x %02x %02x "
                                                   "len %d\n",
+                                                  dev->name, ((u_short *)data)[6],
+                                                  print_mac(mac, &data[6]), print_mac(mac2, data),
                                                   data[15], data[16], data[17], data[18],
                                                   data[19], data[20], data[21], data[22],
-                                                  pkt_len );
+                                                  pkt_len);
                                }
 
                                skb_reserve( skb, 2 );  /* 16 byte align */