aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-09-11 15:10:56 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-13 23:02:52 -0400
commitd81e27cf4e2a5050245f9962539292ea2c9e2206 (patch)
tree3bf8969a9dff29740de0d1d3034a6a4d1bfe7631
parent70ce679be6f7fd8ff24d4b7007e2c0e430587945 (diff)
drivers/net/skfp: Remove pr_<level> uses of KERN_<level>
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/skfp/skfddi.c84
1 files changed, 42 insertions, 42 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 31b2dabf094c..8a12bd9d28ba 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -209,7 +209,7 @@ static int skfp_init_one(struct pci_dev *pdev,
209 void __iomem *mem; 209 void __iomem *mem;
210 int err; 210 int err;
211 211
212 pr_debug(KERN_INFO "entering skfp_init_one\n"); 212 pr_debug("entering skfp_init_one\n");
213 213
214 if (num_boards == 0) 214 if (num_boards == 0)
215 printk("%s\n", boot_msg); 215 printk("%s\n", boot_msg);
@@ -385,7 +385,7 @@ static int skfp_driver_init(struct net_device *dev)
385 skfddi_priv *bp = &smc->os; 385 skfddi_priv *bp = &smc->os;
386 int err = -EIO; 386 int err = -EIO;
387 387
388 pr_debug(KERN_INFO "entering skfp_driver_init\n"); 388 pr_debug("entering skfp_driver_init\n");
389 389
390 // set the io address in private structures 390 // set the io address in private structures
391 bp->base_addr = dev->base_addr; 391 bp->base_addr = dev->base_addr;
@@ -405,7 +405,7 @@ static int skfp_driver_init(struct net_device *dev)
405 405
406 // Determine the required size of the 'shared' memory area. 406 // Determine the required size of the 'shared' memory area.
407 bp->SharedMemSize = mac_drv_check_space(); 407 bp->SharedMemSize = mac_drv_check_space();
408 pr_debug(KERN_INFO "Memory for HWM: %ld\n", bp->SharedMemSize); 408 pr_debug("Memory for HWM: %ld\n", bp->SharedMemSize);
409 if (bp->SharedMemSize > 0) { 409 if (bp->SharedMemSize > 0) {
410 bp->SharedMemSize += 16; // for descriptor alignment 410 bp->SharedMemSize += 16; // for descriptor alignment
411 411
@@ -429,13 +429,13 @@ static int skfp_driver_init(struct net_device *dev)
429 429
430 card_stop(smc); // Reset adapter. 430 card_stop(smc); // Reset adapter.
431 431
432 pr_debug(KERN_INFO "mac_drv_init()..\n"); 432 pr_debug("mac_drv_init()..\n");
433 if (mac_drv_init(smc) != 0) { 433 if (mac_drv_init(smc) != 0) {
434 pr_debug(KERN_INFO "mac_drv_init() failed.\n"); 434 pr_debug("mac_drv_init() failed\n");
435 goto fail; 435 goto fail;
436 } 436 }
437 read_address(smc, NULL); 437 read_address(smc, NULL);
438 pr_debug(KERN_INFO "HW-Addr: %pMF\n", smc->hw.fddi_canon_addr.a); 438 pr_debug("HW-Addr: %pMF\n", smc->hw.fddi_canon_addr.a);
439 memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, 6); 439 memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, 6);
440 440
441 smt_reset_defaults(smc, 0); 441 smt_reset_defaults(smc, 0);
@@ -485,7 +485,7 @@ static int skfp_open(struct net_device *dev)
485 struct s_smc *smc = netdev_priv(dev); 485 struct s_smc *smc = netdev_priv(dev);
486 int err; 486 int err;
487 487
488 pr_debug(KERN_INFO "entering skfp_open\n"); 488 pr_debug("entering skfp_open\n");
489 /* Register IRQ - support shared interrupts by passing device ptr */ 489 /* Register IRQ - support shared interrupts by passing device ptr */
490 err = request_irq(dev->irq, skfp_interrupt, IRQF_SHARED, 490 err = request_irq(dev->irq, skfp_interrupt, IRQF_SHARED,
491 dev->name, dev); 491 dev->name, dev);
@@ -856,12 +856,12 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
856 /* Enable promiscuous mode, if necessary */ 856 /* Enable promiscuous mode, if necessary */
857 if (dev->flags & IFF_PROMISC) { 857 if (dev->flags & IFF_PROMISC) {
858 mac_drv_rx_mode(smc, RX_ENABLE_PROMISC); 858 mac_drv_rx_mode(smc, RX_ENABLE_PROMISC);
859 pr_debug(KERN_INFO "PROMISCUOUS MODE ENABLED\n"); 859 pr_debug("PROMISCUOUS MODE ENABLED\n");
860 } 860 }
861 /* Else, update multicast address table */ 861 /* Else, update multicast address table */
862 else { 862 else {
863 mac_drv_rx_mode(smc, RX_DISABLE_PROMISC); 863 mac_drv_rx_mode(smc, RX_DISABLE_PROMISC);
864 pr_debug(KERN_INFO "PROMISCUOUS MODE DISABLED\n"); 864 pr_debug("PROMISCUOUS MODE DISABLED\n");
865 865
866 // Reset all MC addresses 866 // Reset all MC addresses
867 mac_clear_multicast(smc); 867 mac_clear_multicast(smc);
@@ -869,7 +869,7 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
869 869
870 if (dev->flags & IFF_ALLMULTI) { 870 if (dev->flags & IFF_ALLMULTI) {
871 mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI); 871 mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI);
872 pr_debug(KERN_INFO "ENABLE ALL MC ADDRESSES\n"); 872 pr_debug("ENABLE ALL MC ADDRESSES\n");
873 } else if (!netdev_mc_empty(dev)) { 873 } else if (!netdev_mc_empty(dev)) {
874 if (netdev_mc_count(dev) <= FPMAX_MULTICAST) { 874 if (netdev_mc_count(dev) <= FPMAX_MULTICAST) {
875 /* use exact filtering */ 875 /* use exact filtering */
@@ -880,18 +880,18 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
880 (struct fddi_addr *)ha->addr, 880 (struct fddi_addr *)ha->addr,
881 1); 881 1);
882 882
883 pr_debug(KERN_INFO "ENABLE MC ADDRESS: %pMF\n", 883 pr_debug("ENABLE MC ADDRESS: %pMF\n",
884 ha->addr); 884 ha->addr);
885 } 885 }
886 886
887 } else { // more MC addresses than HW supports 887 } else { // more MC addresses than HW supports
888 888
889 mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI); 889 mac_drv_rx_mode(smc, RX_ENABLE_ALLMULTI);
890 pr_debug(KERN_INFO "ENABLE ALL MC ADDRESSES\n"); 890 pr_debug("ENABLE ALL MC ADDRESSES\n");
891 } 891 }
892 } else { // no MC addresses 892 } else { // no MC addresses
893 893
894 pr_debug(KERN_INFO "DISABLE ALL MC ADDRESSES\n"); 894 pr_debug("DISABLE ALL MC ADDRESSES\n");
895 } 895 }
896 896
897 /* Update adapter filters */ 897 /* Update adapter filters */
@@ -1045,7 +1045,7 @@ static netdev_tx_t skfp_send_pkt(struct sk_buff *skb,
1045 struct s_smc *smc = netdev_priv(dev); 1045 struct s_smc *smc = netdev_priv(dev);
1046 skfddi_priv *bp = &smc->os; 1046 skfddi_priv *bp = &smc->os;
1047 1047
1048 pr_debug(KERN_INFO "skfp_send_pkt\n"); 1048 pr_debug("skfp_send_pkt\n");
1049 1049
1050 /* 1050 /*
1051 * Verify that incoming transmit request is OK 1051 * Verify that incoming transmit request is OK
@@ -1114,13 +1114,13 @@ static void send_queued_packets(struct s_smc *smc)
1114 1114
1115 int frame_status; // HWM tx frame status. 1115 int frame_status; // HWM tx frame status.
1116 1116
1117 pr_debug(KERN_INFO "send queued packets\n"); 1117 pr_debug("send queued packets\n");
1118 for (;;) { 1118 for (;;) {
1119 // send first buffer from queue 1119 // send first buffer from queue
1120 skb = skb_dequeue(&bp->SendSkbQueue); 1120 skb = skb_dequeue(&bp->SendSkbQueue);
1121 1121
1122 if (!skb) { 1122 if (!skb) {
1123 pr_debug(KERN_INFO "queue empty\n"); 1123 pr_debug("queue empty\n");
1124 return; 1124 return;
1125 } // queue empty ! 1125 } // queue empty !
1126 1126
@@ -1232,7 +1232,7 @@ static void CheckSourceAddress(unsigned char *frame, unsigned char *hw_addr)
1232static void ResetAdapter(struct s_smc *smc) 1232static void ResetAdapter(struct s_smc *smc)
1233{ 1233{
1234 1234
1235 pr_debug(KERN_INFO "[fddi: ResetAdapter]\n"); 1235 pr_debug("[fddi: ResetAdapter]\n");
1236 1236
1237 // Stop the adapter. 1237 // Stop the adapter.
1238 1238
@@ -1278,7 +1278,7 @@ void llc_restart_tx(struct s_smc *smc)
1278{ 1278{
1279 skfddi_priv *bp = &smc->os; 1279 skfddi_priv *bp = &smc->os;
1280 1280
1281 pr_debug(KERN_INFO "[llc_restart_tx]\n"); 1281 pr_debug("[llc_restart_tx]\n");
1282 1282
1283 // Try to send queued packets 1283 // Try to send queued packets
1284 spin_unlock(&bp->DriverLock); 1284 spin_unlock(&bp->DriverLock);
@@ -1308,7 +1308,7 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size)
1308{ 1308{
1309 void *virt; 1309 void *virt;
1310 1310
1311 pr_debug(KERN_INFO "mac_drv_get_space (%d bytes), ", size); 1311 pr_debug("mac_drv_get_space (%d bytes), ", size);
1312 virt = (void *) (smc->os.SharedMemAddr + smc->os.SharedMemHeap); 1312 virt = (void *) (smc->os.SharedMemAddr + smc->os.SharedMemHeap);
1313 1313
1314 if ((smc->os.SharedMemHeap + size) > smc->os.SharedMemSize) { 1314 if ((smc->os.SharedMemHeap + size) > smc->os.SharedMemSize) {
@@ -1317,9 +1317,9 @@ void *mac_drv_get_space(struct s_smc *smc, unsigned int size)
1317 } 1317 }
1318 smc->os.SharedMemHeap += size; // Move heap pointer. 1318 smc->os.SharedMemHeap += size; // Move heap pointer.
1319 1319
1320 pr_debug(KERN_INFO "mac_drv_get_space end\n"); 1320 pr_debug("mac_drv_get_space end\n");
1321 pr_debug(KERN_INFO "virt addr: %lx\n", (ulong) virt); 1321 pr_debug("virt addr: %lx\n", (ulong) virt);
1322 pr_debug(KERN_INFO "bus addr: %lx\n", (ulong) 1322 pr_debug("bus addr: %lx\n", (ulong)
1323 (smc->os.SharedMemDMA + 1323 (smc->os.SharedMemDMA +
1324 ((char *) virt - (char *)smc->os.SharedMemAddr))); 1324 ((char *) virt - (char *)smc->os.SharedMemAddr)));
1325 return (virt); 1325 return (virt);
@@ -1349,7 +1349,7 @@ void *mac_drv_get_desc_mem(struct s_smc *smc, unsigned int size)
1349 1349
1350 char *virt; 1350 char *virt;
1351 1351
1352 pr_debug(KERN_INFO "mac_drv_get_desc_mem\n"); 1352 pr_debug("mac_drv_get_desc_mem\n");
1353 1353
1354 // Descriptor memory must be aligned on 16-byte boundary. 1354 // Descriptor memory must be aligned on 16-byte boundary.
1355 1355
@@ -1493,7 +1493,7 @@ void mac_drv_tx_complete(struct s_smc *smc, volatile struct s_smt_fp_txd *txd)
1493{ 1493{
1494 struct sk_buff *skb; 1494 struct sk_buff *skb;
1495 1495
1496 pr_debug(KERN_INFO "entering mac_drv_tx_complete\n"); 1496 pr_debug("entering mac_drv_tx_complete\n");
1497 // Check if this TxD points to a skb 1497 // Check if this TxD points to a skb
1498 1498
1499 if (!(skb = txd->txd_os.skb)) { 1499 if (!(skb = txd->txd_os.skb)) {
@@ -1513,7 +1513,7 @@ void mac_drv_tx_complete(struct s_smc *smc, volatile struct s_smt_fp_txd *txd)
1513 // free the skb 1513 // free the skb
1514 dev_kfree_skb_irq(skb); 1514 dev_kfree_skb_irq(skb);
1515 1515
1516 pr_debug(KERN_INFO "leaving mac_drv_tx_complete\n"); 1516 pr_debug("leaving mac_drv_tx_complete\n");
1517} // mac_drv_tx_complete 1517} // mac_drv_tx_complete
1518 1518
1519 1519
@@ -1580,7 +1580,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
1580 unsigned short ri; 1580 unsigned short ri;
1581 u_int RifLength; 1581 u_int RifLength;
1582 1582
1583 pr_debug(KERN_INFO "entering mac_drv_rx_complete (len=%d)\n", len); 1583 pr_debug("entering mac_drv_rx_complete (len=%d)\n", len);
1584 if (frag_count != 1) { // This is not allowed to happen. 1584 if (frag_count != 1) { // This is not allowed to happen.
1585 1585
1586 printk("fddi: Multi-fragment receive!\n"); 1586 printk("fddi: Multi-fragment receive!\n");
@@ -1589,7 +1589,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
1589 } 1589 }
1590 skb = rxd->rxd_os.skb; 1590 skb = rxd->rxd_os.skb;
1591 if (!skb) { 1591 if (!skb) {
1592 pr_debug(KERN_INFO "No skb in rxd\n"); 1592 pr_debug("No skb in rxd\n");
1593 smc->os.MacStat.gen.rx_errors++; 1593 smc->os.MacStat.gen.rx_errors++;
1594 goto RequeueRxd; 1594 goto RequeueRxd;
1595 } 1595 }
@@ -1619,7 +1619,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
1619 else { 1619 else {
1620 int n; 1620 int n;
1621// goos: RIF removal has still to be tested 1621// goos: RIF removal has still to be tested
1622 pr_debug(KERN_INFO "RIF found\n"); 1622 pr_debug("RIF found\n");
1623 // Get RIF length from Routing Control (RC) field. 1623 // Get RIF length from Routing Control (RC) field.
1624 cp = virt + FDDI_MAC_HDR_LEN; // Point behind MAC header. 1624 cp = virt + FDDI_MAC_HDR_LEN; // Point behind MAC header.
1625 1625
@@ -1664,7 +1664,7 @@ void mac_drv_rx_complete(struct s_smc *smc, volatile struct s_smt_fp_rxd *rxd,
1664 return; 1664 return;
1665 1665
1666 RequeueRxd: 1666 RequeueRxd:
1667 pr_debug(KERN_INFO "Rx: re-queue RXD.\n"); 1667 pr_debug("Rx: re-queue RXD.\n");
1668 mac_drv_requeue_rxd(smc, rxd, frag_count); 1668 mac_drv_requeue_rxd(smc, rxd, frag_count);
1669 smc->os.MacStat.gen.rx_errors++; // Count receive packets 1669 smc->os.MacStat.gen.rx_errors++; // Count receive packets
1670 // not indicated. 1670 // not indicated.
@@ -1775,7 +1775,7 @@ void mac_drv_fill_rxd(struct s_smc *smc)
1775 struct sk_buff *skb; 1775 struct sk_buff *skb;
1776 volatile struct s_smt_fp_rxd *rxd; 1776 volatile struct s_smt_fp_rxd *rxd;
1777 1777
1778 pr_debug(KERN_INFO "entering mac_drv_fill_rxd\n"); 1778 pr_debug("entering mac_drv_fill_rxd\n");
1779 1779
1780 // Walk through the list of free receive buffers, passing receive 1780 // Walk through the list of free receive buffers, passing receive
1781 // buffers to the HWM as long as RXDs are available. 1781 // buffers to the HWM as long as RXDs are available.
@@ -1783,7 +1783,7 @@ void mac_drv_fill_rxd(struct s_smc *smc)
1783 MaxFrameSize = smc->os.MaxFrameSize; 1783 MaxFrameSize = smc->os.MaxFrameSize;
1784 // Check if there is any RXD left. 1784 // Check if there is any RXD left.
1785 while (HWM_GET_RX_FREE(smc) > 0) { 1785 while (HWM_GET_RX_FREE(smc) > 0) {
1786 pr_debug(KERN_INFO ".\n"); 1786 pr_debug(".\n");
1787 1787
1788 rxd = HWM_GET_CURR_RXD(smc); 1788 rxd = HWM_GET_CURR_RXD(smc);
1789 skb = alloc_skb(MaxFrameSize + 3, GFP_ATOMIC); 1789 skb = alloc_skb(MaxFrameSize + 3, GFP_ATOMIC);
@@ -1814,7 +1814,7 @@ void mac_drv_fill_rxd(struct s_smc *smc)
1814 hwm_rx_frag(smc, v_addr, b_addr, MaxFrameSize, 1814 hwm_rx_frag(smc, v_addr, b_addr, MaxFrameSize,
1815 FIRST_FRAG | LAST_FRAG); 1815 FIRST_FRAG | LAST_FRAG);
1816 } 1816 }
1817 pr_debug(KERN_INFO "leaving mac_drv_fill_rxd\n"); 1817 pr_debug("leaving mac_drv_fill_rxd\n");
1818} // mac_drv_fill_rxd 1818} // mac_drv_fill_rxd
1819 1819
1820 1820
@@ -2034,17 +2034,17 @@ void smt_stat_counter(struct s_smc *smc, int stat)
2034{ 2034{
2035// BOOLEAN RingIsUp ; 2035// BOOLEAN RingIsUp ;
2036 2036
2037 pr_debug(KERN_INFO "smt_stat_counter\n"); 2037 pr_debug("smt_stat_counter\n");
2038 switch (stat) { 2038 switch (stat) {
2039 case 0: 2039 case 0:
2040 pr_debug(KERN_INFO "Ring operational change.\n"); 2040 pr_debug("Ring operational change.\n");
2041 break; 2041 break;
2042 case 1: 2042 case 1:
2043 pr_debug(KERN_INFO "Receive fifo overflow.\n"); 2043 pr_debug("Receive fifo overflow.\n");
2044 smc->os.MacStat.gen.rx_errors++; 2044 smc->os.MacStat.gen.rx_errors++;
2045 break; 2045 break;
2046 default: 2046 default:
2047 pr_debug(KERN_INFO "Unknown status (%d).\n", stat); 2047 pr_debug("Unknown status (%d).\n", stat);
2048 break; 2048 break;
2049 } 2049 }
2050} // smt_stat_counter 2050} // smt_stat_counter
@@ -2100,10 +2100,10 @@ void cfm_state_change(struct s_smc *smc, int c_state)
2100 s = "SC11_C_WRAP_S"; 2100 s = "SC11_C_WRAP_S";
2101 break; 2101 break;
2102 default: 2102 default:
2103 pr_debug(KERN_INFO "cfm_state_change: unknown %d\n", c_state); 2103 pr_debug("cfm_state_change: unknown %d\n", c_state);
2104 return; 2104 return;
2105 } 2105 }
2106 pr_debug(KERN_INFO "cfm_state_change: %s\n", s); 2106 pr_debug("cfm_state_change: %s\n", s);
2107#endif // DRIVERDEBUG 2107#endif // DRIVERDEBUG
2108} // cfm_state_change 2108} // cfm_state_change
2109 2109
@@ -2158,7 +2158,7 @@ void ecm_state_change(struct s_smc *smc, int e_state)
2158 s = "unknown"; 2158 s = "unknown";
2159 break; 2159 break;
2160 } 2160 }
2161 pr_debug(KERN_INFO "ecm_state_change: %s\n", s); 2161 pr_debug("ecm_state_change: %s\n", s);
2162#endif //DRIVERDEBUG 2162#endif //DRIVERDEBUG
2163} // ecm_state_change 2163} // ecm_state_change
2164 2164
@@ -2213,7 +2213,7 @@ void rmt_state_change(struct s_smc *smc, int r_state)
2213 s = "unknown"; 2213 s = "unknown";
2214 break; 2214 break;
2215 } 2215 }
2216 pr_debug(KERN_INFO "[rmt_state_change: %s]\n", s); 2216 pr_debug("[rmt_state_change: %s]\n", s);
2217#endif // DRIVERDEBUG 2217#endif // DRIVERDEBUG
2218} // rmt_state_change 2218} // rmt_state_change
2219 2219
@@ -2233,7 +2233,7 @@ void rmt_state_change(struct s_smc *smc, int r_state)
2233 ************************/ 2233 ************************/
2234void drv_reset_indication(struct s_smc *smc) 2234void drv_reset_indication(struct s_smc *smc)
2235{ 2235{
2236 pr_debug(KERN_INFO "entering drv_reset_indication\n"); 2236 pr_debug("entering drv_reset_indication\n");
2237 2237
2238 smc->os.ResetRequested = TRUE; // Set flag. 2238 smc->os.ResetRequested = TRUE; // Set flag.
2239 2239