tulip: Convert uses of KERN_DEBUG

Convert logging messages to more current styles.

Added -DDEBUG to Makefile to maintain current message logging.
This could be converted to a specific CONFIG_TULIP_DEBUG option.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 24 insertions, 24 deletions

diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 0013642903ee..5350d753e0ff 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -125,12 +125,12 @@ int tulip_poll(struct napi_struct *napi, int budget)
 #endif
 
         if (tulip_debug > 4)
-                printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
-                       entry, tp->rx_ring[entry].status);
+                netdev_dbg(dev, " In tulip_rx(), entry %d %08x\n",
+                           entry, tp->rx_ring[entry].status);
 
        do {
                 if (ioread32(tp->base_addr + CSR5) == 0xffffffff) {
-                        printk(KERN_DEBUG " In tulip_poll(), hardware disappeared\n");
+                        netdev_dbg(dev, " In tulip_poll(), hardware disappeared\n");
                         break;
                 }
                /* Acknowledge current RX interrupt sources. */
@@ -145,9 +145,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
                        if (tp->dirty_rx + RX_RING_SIZE == tp->cur_rx)
                                break;
 
-                       if (tulip_debug > 5)
-                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
-                                      dev->name, entry, status);
+                       if (tulip_debug > 5)
+                                netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+                                           entry, status);
 
                        if (++work_done >= budget)
                                goto not_done;
@@ -184,9 +184,9 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                         }
                                } else {
                                 /* There was a fatal error. */
-                                       if (tulip_debug > 2)
-                                               printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
-                                                      dev->name, status);
+                                       if (tulip_debug > 2)
+                                                netdev_dbg(dev, "Receive error, Rx status %08x\n",
+                                                           status);
                                         dev->stats.rx_errors++; /* end of a packet.*/
                                         if (pkt_len > 1518 ||
                                             (status & RxDescRunt))
@@ -367,16 +367,16 @@ static int tulip_rx(struct net_device *dev)
         int received = 0;
 
         if (tulip_debug > 4)
-                printk(KERN_DEBUG " In tulip_rx(), entry %d %08x\n",
-                       entry, tp->rx_ring[entry].status);
+                netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+                           entry, tp->rx_ring[entry].status);
         /* If we own the next entry, it is a new packet. Send it up. */
         while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
                 s32 status = le32_to_cpu(tp->rx_ring[entry].status);
                 short pkt_len;
 
                 if (tulip_debug > 5)
-                        printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %08x\n",
-                               dev->name, entry, status);
+                        netdev_dbg(dev, "In tulip_rx(), entry %d %08x\n",
+                                   entry, status);
                 if (--rx_work_limit < 0)
                         break;
 
@@ -404,16 +404,16 @@ static int tulip_rx(struct net_device *dev)
                                 /* Ingore earlier buffers. */
                                 if ((status & 0xffff) != 0x7fff) {
                                         if (tulip_debug > 1)
-                                                dev_warn(&dev->dev,
-                                                         "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
-                                                         status);
+                                                netdev_warn(dev,
+                                                            "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
+                                                            status);
                                         dev->stats.rx_length_errors++;
                                 }
                         } else {
                                 /* There was a fatal error. */
                                 if (tulip_debug > 2)
-                                        printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
-                                               dev->name, status);
+                                        netdev_dbg(dev, "Receive error, Rx status %08x\n",
+                                                   status);
                                 dev->stats.rx_errors++; /* end of a packet.*/
                                 if (pkt_len > 1518 ||
                                     (status & RxDescRunt))
@@ -573,8 +573,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
 #endif /*  CONFIG_TULIP_NAPI */
 
                 if (tulip_debug > 4)
-                        printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x\n",
-                               dev->name, csr5, ioread32(ioaddr + CSR5));
+                        netdev_dbg(dev, "interrupt  csr5=%#8.8x new csr5=%#8.8x\n",
+                                   csr5, ioread32(ioaddr + CSR5));
 
 
                 if (csr5 & (TxNoBuf | TxDied | TxIntr | TimerInt)) {
@@ -605,8 +605,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                         /* There was an major error, log it. */
 #ifndef final_version
                                         if (tulip_debug > 1)
-                                                printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
-                                                       dev->name, status);
+                                                netdev_dbg(dev, "Transmit error, Tx status %08x\n",
+                                                           status);
 #endif
                                         dev->stats.tx_errors++;
                                         if (status & 0x4104)
@@ -804,8 +804,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
         }
 
         if (tulip_debug > 4)
-                printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#04x\n",
-                       dev->name, ioread32(ioaddr + CSR5));
+                netdev_dbg(dev, "exiting interrupt, csr5=%#04x\n",
+                           ioread32(ioaddr + CSR5));
 
         return IRQ_HANDLED;
 }