3c5xx: convert printk() to pr_<foo>()

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 48 insertions, 43 deletions

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 8f734d74b513..cdd955c4014c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -176,7 +176,7 @@ sizeof(nop_cmd) = 8;
     if(!p->scb->cmd) break; \
     DELAY_16(); \
     if(i == 1023) { \
-      printk(KERN_WARNING "%s:%d: scb_cmd timed out .. resetting i82586\n",\
+      pr_warning("%s:%d: scb_cmd timed out .. resetting i82586\n",\
         dev->name,__LINE__); \
       elmc_id_reset586(); } } }
 
@@ -291,7 +291,7 @@ static int elmc_open(struct net_device *dev)
         ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                           dev->name, dev);
         if (ret) {
-                printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
+                pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq);
                 elmc_id_reset586();
                 return ret;
         }
@@ -371,9 +371,9 @@ static void alloc586(struct net_device *dev)
 
         DELAY(2);
 
-        if (p->iscp->busy) {
-                printk(KERN_ERR "%s: Init-Problems (alloc).\n", dev->name);
-        }
+        if (p->iscp->busy)
+                pr_err("%s: Init-Problems (alloc).\n", dev->name);
+
         memset((char *) p->scb, 0, sizeof(struct scb_struct));
 }
 
@@ -470,7 +470,7 @@ static int __init do_elmc_probe(struct net_device *dev)
         mca_set_adapter_procfn(slot, (MCA_ProcFn) elmc_getinfo, dev);
 
         /* if we get this far, adapter has been found - carry on */
-        printk(KERN_INFO "%s: 3c523 adapter found in slot %d\n", dev->name, slot + 1);
+        pr_info("%s: 3c523 adapter found in slot %d\n", dev->name, slot + 1);
 
         /* Now we extract configuration info from the card.
            The 3c523 provides information in two of the POS registers, but
@@ -507,7 +507,7 @@ static int __init do_elmc_probe(struct net_device *dev)
         memset(pr, 0, sizeof(struct priv));
         pr->slot = slot;
 
-        printk(KERN_INFO "%s: 3Com 3c523 Rev 0x%x at %#lx\n", dev->name, (int) revision,
+        pr_info("%s: 3Com 3c523 Rev 0x%x at %#lx\n", dev->name, (int) revision,
                dev->base_addr);
 
         /* Determine if we're using the on-board transceiver (i.e. coax) or
@@ -529,7 +529,7 @@ static int __init do_elmc_probe(struct net_device *dev)
 
         size = 0x4000;          /* check for 16K mem */
         if (!check586(dev, dev->mem_start, size)) {
-                printk(KERN_ERR "%s: memprobe, Can't find memory at 0x%lx!\n", dev->name,
+                pr_err("%s: memprobe, Can't find memory at 0x%lx!\n", dev->name,
                        dev->mem_start);
                 retval = -ENODEV;
                 goto err_out;
@@ -546,7 +546,7 @@ static int __init do_elmc_probe(struct net_device *dev)
         pr->num_recv_buffs = NUM_RECV_BUFFS_16;
 
         /* dump all the assorted information */
-        printk(KERN_INFO "%s: IRQ %d, %sternal xcvr, memory %#lx-%#lx.\n", dev->name,
+        pr_info("%s: IRQ %d, %sternal xcvr, memory %#lx-%#lx.\n", dev->name,
                dev->irq, dev->if_port ? "ex" : "in",
                dev->mem_start, dev->mem_end - 1);
 
@@ -555,7 +555,7 @@ static int __init do_elmc_probe(struct net_device *dev)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(dev->base_addr + i);
 
-        printk(KERN_INFO "%s: hardware address %pM\n",
+        pr_info("%s: hardware address %pM\n",
                dev->name, dev->dev_addr);
 
         dev->netdev_ops = &netdev_ops;
@@ -660,7 +660,7 @@ static int init586(struct net_device *dev)
         }
 
         if ((cfg_cmd->cmd_status & (STAT_OK | STAT_COMPL)) != (STAT_COMPL | STAT_OK)) {
-                printk(KERN_WARNING "%s (elmc): configure command failed: %x\n", dev->name, cfg_cmd->cmd_status);
+                pr_warning("%s (elmc): configure command failed: %x\n", dev->name, cfg_cmd->cmd_status);
                 return 1;
         }
         /*
@@ -686,7 +686,8 @@ static int init586(struct net_device *dev)
         }
 
         if ((ias_cmd->cmd_status & (STAT_OK | STAT_COMPL)) != (STAT_OK | STAT_COMPL)) {
-                printk(KERN_WARNING "%s (elmc): individual address setup command failed: %04x\n", dev->name, ias_cmd->cmd_status);
+                pr_warning("%s (elmc): individual address setup command failed: %04x\n",
+                        dev->name, ias_cmd->cmd_status);
                 return 1;
         }
         /*
@@ -707,7 +708,7 @@ static int init586(struct net_device *dev)
         s = jiffies;
         while (!(tdr_cmd->cmd_status & STAT_COMPL)) {
                 if (time_after(jiffies, s + 30*HZ/100)) {
-                        printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
+                        pr_warning("%s: %d Problems while running the TDR.\n", dev->name, __LINE__);
                         result = 1;
                         break;
                 }
@@ -723,14 +724,14 @@ static int init586(struct net_device *dev)
                 if (result & TDR_LNK_OK) {
                         /* empty */
                 } else if (result & TDR_XCVR_PRB) {
-                        printk(KERN_WARNING "%s: TDR: Transceiver problem!\n", dev->name);
+                        pr_warning("%s: TDR: Transceiver problem!\n", dev->name);
                 } else if (result & TDR_ET_OPN) {
-                        printk(KERN_WARNING "%s: TDR: No correct termination %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
+                        pr_warning("%s: TDR: No correct termination %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
                 } else if (result & TDR_ET_SRT) {
                         if (result & TDR_TIMEMASK)      /* time == 0 -> strange :-) */
-                                printk(KERN_WARNING "%s: TDR: Detected a short circuit %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
+                                pr_warning("%s: TDR: Detected a short circuit %d clocks away.\n", dev->name, result & TDR_TIMEMASK);
                 } else {
-                        printk(KERN_WARNING "%s: TDR: Unknown status %04x\n", dev->name, result);
+                        pr_warning("%s: TDR: Unknown status %04x\n", dev->name, result);
                 }
         }
         /*
@@ -774,11 +775,11 @@ static int init586(struct net_device *dev)
                 /* I don't understand this: do we really need memory after the init? */
                 int len = ((char *) p->iscp - (char *) ptr - 8) / 6;
                 if (len <= 0) {
-                        printk(KERN_ERR "%s: Ooooops, no memory for MC-Setup!\n", dev->name);
+                        pr_err("%s: Ooooops, no memory for MC-Setup!\n", dev->name);
                 } else {
                         if (len < num_addrs) {
                                 num_addrs = len;
-                                printk(KERN_WARNING "%s: Sorry, can only apply %d MC-Address(es).\n",
+                                pr_warning("%s: Sorry, can only apply %d MC-Address(es).\n",
                                        dev->name, num_addrs);
                         }
                         mc_cmd = (struct mcsetup_cmd_struct *) ptr;
@@ -799,7 +800,7 @@ static int init586(struct net_device *dev)
                                         break;
                         }
                         if (!(mc_cmd->cmd_status & STAT_COMPL)) {
-                                printk(KERN_WARNING "%s: Can't apply multicast-address-list.\n", dev->name);
+                                pr_warning("%s: Can't apply multicast-address-list.\n", dev->name);
                         }
                 }
         }
@@ -812,7 +813,7 @@ static int init586(struct net_device *dev)
                 p->xmit_buffs[i] = (struct tbd_struct *) ptr;   /* TBD */
                 ptr = (char *) ptr + sizeof(struct tbd_struct);
                 if ((void *) ptr > (void *) p->iscp) {
-                        printk(KERN_ERR "%s: not enough shared-mem for your configuration!\n", dev->name);
+                        pr_err("%s: not enough shared-mem for your configuration!\n", dev->name);
                         return 1;
                 }
                 memset((char *) (p->xmit_cmds[i]), 0, sizeof(struct transmit_cmd_struct));
@@ -936,7 +937,8 @@ elmc_interrupt(int irq, void *dev_id)
                 if (stat & STAT_CNA) {
                         /* CU went 'not ready' */
                         if (netif_running(dev)) {
-                                printk(KERN_WARNING "%s: oops! CU has left active state. stat: %04x/%04x.\n", dev->name, (int) stat, (int) p->scb->status);
+                                pr_warning("%s: oops! CU has left active state. stat: %04x/%04x.\n",
+                                        dev->name, (int) stat, (int) p->scb->status);
                         }
                 }
 #endif
@@ -951,7 +953,8 @@ elmc_interrupt(int irq, void *dev_id)
                                 p->scb->cmd = RUC_RESUME;
                                 elmc_attn586();
                         } else {
-                                printk(KERN_WARNING "%s: Receiver-Unit went 'NOT READY': %04x/%04x.\n", dev->name, (int) stat, (int) p->scb->status);
+                                pr_warning("%s: Receiver-Unit went 'NOT READY': %04x/%04x.\n",
+                                        dev->name, (int) stat, (int) p->scb->status);
                                 elmc_rnr_int(dev);
                         }
                 }
@@ -995,11 +998,11 @@ static void elmc_rcv_int(struct net_device *dev)
                                         dev->stats.rx_dropped++;
                                 }
                         } else {
-                                printk(KERN_WARNING "%s: received oversized frame.\n", dev->name);
+                                pr_warning("%s: received oversized frame.\n", dev->name);
                                 dev->stats.rx_dropped++;
                         }
                 } else {        /* frame !(ok), only with 'save-bad-frames' */
-                        printk(KERN_WARNING "%s: oops! rfd-error-status: %04x\n", dev->name, status);
+                        pr_warning("%s: oops! rfd-error-status: %04x\n", dev->name, status);
                         dev->stats.rx_errors++;
                 }
                 p->rfd_top->status = 0;
@@ -1028,7 +1031,7 @@ static void elmc_rnr_int(struct net_device *dev)
         alloc_rfa(dev, (char *) p->rfd_first);
         startrecv586(dev);      /* restart RU */
 
-        printk(KERN_WARNING "%s: Receive-Unit restarted. Status: %04x\n", dev->name, p->scb->status);
+        pr_warning("%s: Receive-Unit restarted. Status: %04x\n", dev->name, p->scb->status);
 
 }
 
@@ -1043,7 +1046,7 @@ static void elmc_xmt_int(struct net_device *dev)
 
         status = p->xmit_cmds[p->xmit_last]->cmd_status;
         if (!(status & STAT_COMPL)) {
-                printk(KERN_WARNING "%s: strange .. xmit-int without a 'COMPLETE'\n", dev->name);
+                pr_warning("%s: strange .. xmit-int without a 'COMPLETE'\n", dev->name);
         }
         if (status & STAT_OK) {
                 dev->stats.tx_packets++;
@@ -1051,18 +1054,18 @@ static void elmc_xmt_int(struct net_device *dev)
         } else {
                 dev->stats.tx_errors++;
                 if (status & TCMD_LATECOLL) {
-                        printk(KERN_WARNING "%s: late collision detected.\n", dev->name);
+                        pr_warning("%s: late collision detected.\n", dev->name);
                         dev->stats.collisions++;
                 } else if (status & TCMD_NOCARRIER) {
                         dev->stats.tx_carrier_errors++;
-                        printk(KERN_WARNING "%s: no carrier detected.\n", dev->name);
+                        pr_warning("%s: no carrier detected.\n", dev->name);
                 } else if (status & TCMD_LOSTCTS) {
-                        printk(KERN_WARNING "%s: loss of CTS detected.\n", dev->name);
+                        pr_warning("%s: loss of CTS detected.\n", dev->name);
                 } else if (status & TCMD_UNDERRUN) {
                         dev->stats.tx_fifo_errors++;
-                        printk(KERN_WARNING "%s: DMA underrun detected.\n", dev->name);
+                        pr_warning("%s: DMA underrun detected.\n", dev->name);
                 } else if (status & TCMD_MAXCOLL) {
-                        printk(KERN_WARNING "%s: Max. collisions exceeded.\n", dev->name);
+                        pr_warning("%s: Max. collisions exceeded.\n", dev->name);
                         dev->stats.collisions += 16;
                 }
         }
@@ -1099,10 +1102,11 @@ static void elmc_timeout(struct net_device *dev)
         struct priv *p = netdev_priv(dev);
         /* COMMAND-UNIT active? */
         if (p->scb->status & CU_ACTIVE) {
-#ifdef DEBUG
-                printk("%s: strange ... timeout with CU active?!?\n", dev->name);
-                printk("%s: X0: %04x N0: %04x N1: %04x %d\n", dev->name, (int) p->xmit_cmds[0]->cmd_status, (int) p->nop_cmds[0]->cmd_status, (int) p->nop_cmds[1]->cmd_status, (int) p->nop_point);
-#endif
+                pr_debug("%s: strange ... timeout with CU active?!?\n", dev->name);
+                pr_debug("%s: X0: %04x N0: %04x N1: %04x %d\n", dev->name,
+                        (int)p->xmit_cmds[0]->cmd_status,
+                        (int)p->nop_cmds[0]->cmd_status,
+                        (int)p->nop_cmds[1]->cmd_status, (int)p->nop_point);
                 p->scb->cmd = CUC_ABORT;
                 elmc_attn586();
                 WAIT_4_SCB_CMD();
@@ -1112,10 +1116,10 @@ static void elmc_timeout(struct net_device *dev)
                 WAIT_4_SCB_CMD();
                 netif_wake_queue(dev);
         } else {
-#ifdef DEBUG
-                printk("%s: xmitter timed out, try to restart! stat: %04x\n", dev->name, p->scb->status);
-                printk("%s: command-stats: %04x %04x\n", dev->name, p->xmit_cmds[0]->cmd_status, p->xmit_cmds[1]->cmd_status);
-#endif
+                pr_debug("%s: xmitter timed out, try to restart! stat: %04x\n",
+                        dev->name, p->scb->status);
+                pr_debug("%s: command-stats: %04x %04x\n", dev->name,
+                        p->xmit_cmds[0]->cmd_status, p->xmit_cmds[1]->cmd_status);
                 elmc_close(dev);
                 elmc_open(dev);
         }
@@ -1162,7 +1166,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
                         break;
                 }
                 if (i == 15) {
-                        printk(KERN_WARNING "%s: Can't start transmit-command.\n", dev->name);
+                        pr_warning("%s: Can't start transmit-command.\n", dev->name);
                 }
         }
 #else
@@ -1287,11 +1291,12 @@ int __init init_module(void)
                 free_netdev(dev);
                 if (io[this_dev]==0)
                         break;
-                printk(KERN_WARNING "3c523.c: No 3c523 card found at io=%#x\n",io[this_dev]);
+                pr_warning("3c523.c: No 3c523 card found at io=%#x\n",io[this_dev]);
         }
 
         if(found==0) {
-                if(io[0]==0) printk(KERN_NOTICE "3c523.c: No 3c523 cards found\n");
+                if (io[0]==0)
+                        pr_notice("3c523.c: No 3c523 cards found\n");
                 return -ENXIO;
         } else return 0;
 }