Skip to content

L
linux
Commit 13ff83b9 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

drivers/net/pcnet32.c: Use (pr|netdev|netif)_<levels> macro helpers 

Make the output logging messages a bit more consistent.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 249658d5
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 217 deletions
drivers/net/pcnet32.c
View file @ 13ff83b9
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* *
*************************************************************************/ *************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define DRV_NAME "pcnet32" #define DRV_NAME "pcnet32"
#define DRV_VERSION "1.35" #define DRV_VERSION "1.35"
#define DRV_RELDATE "21.Apr.2008" #define DRV_RELDATE "21.Apr.2008"
...@@ -487,10 +489,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, ...@@ -487,10 +489,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
(1 << size), (1 << size),
&new_ring_dma_addr); &new_ring_dma_addr);
if (new_tx_ring == NULL) { if (new_tx_ring == NULL) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
printk(KERN_ERR
"%s: Consistent memory allocation failed.\n",
dev->name);
return; return;
} }
memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size)); memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
...@@ -498,18 +497,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, ...@@ -498,18 +497,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t), new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
GFP_ATOMIC); GFP_ATOMIC);
if (!new_dma_addr_list) { if (!new_dma_addr_list) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR
"%s: Memory allocation failed.\n", dev->name);
goto free_new_tx_ring; goto free_new_tx_ring;
} }
new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *), new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
GFP_ATOMIC); GFP_ATOMIC);
if (!new_skb_list) { if (!new_skb_list) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR
"%s: Memory allocation failed.\n", dev->name);
goto free_new_lists; goto free_new_lists;
} }
...@@ -565,10 +560,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, ...@@ -565,10 +560,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
(1 << size), (1 << size),
&new_ring_dma_addr); &new_ring_dma_addr);
if (new_rx_ring == NULL) { if (new_rx_ring == NULL) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
printk(KERN_ERR
"%s: Consistent memory allocation failed.\n",
dev->name);
return; return;
} }
memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size)); memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
...@@ -576,18 +568,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, ...@@ -576,18 +568,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t), new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
GFP_ATOMIC); GFP_ATOMIC);
if (!new_dma_addr_list) { if (!new_dma_addr_list) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR
"%s: Memory allocation failed.\n", dev->name);
goto free_new_rx_ring; goto free_new_rx_ring;
} }
new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *), new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
GFP_ATOMIC); GFP_ATOMIC);
if (!new_skb_list) { if (!new_skb_list) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR
"%s: Memory allocation failed.\n", dev->name);
goto free_new_lists; goto free_new_lists;
} }
...@@ -604,10 +592,8 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, ...@@ -604,10 +592,8 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB); new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
if (!(rx_skbuff = new_skb_list[new])) { if (!(rx_skbuff = new_skb_list[new])) {
/* keep the original lists and buffers */ /* keep the original lists and buffers */
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
printk(KERN_ERR __func__);
"%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n",
dev->name);
goto free_all_new; goto free_all_new;
} }
skb_reserve(rx_skbuff, NET_IP_ALIGN); skb_reserve(rx_skbuff, NET_IP_ALIGN);
...@@ -838,9 +824,7 @@ static int pcnet32_set_ringparam(struct net_device *dev, ...@@ -838,9 +824,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
if (netif_msg_drv(lp)) netif_info(lp, drv, dev, "Ring Param Settings: RX: %d, TX: %d\n",
printk(KERN_INFO
"%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
lp->rx_ring_size, lp->tx_ring_size); lp->rx_ring_size, lp->tx_ring_size);
return 0; return 0;
...@@ -871,17 +855,15 @@ static void pcnet32_ethtool_test(struct net_device *dev, ...@@ -871,17 +855,15 @@ static void pcnet32_ethtool_test(struct net_device *dev,
if (test->flags == ETH_TEST_FL_OFFLINE) { if (test->flags == ETH_TEST_FL_OFFLINE) {
rc = pcnet32_loopback_test(dev, data); rc = pcnet32_loopback_test(dev, data);
if (rc) { if (rc) {
if (netif_msg_hw(lp)) netif_printk(lp, hw, KERN_DEBUG, dev,
printk(KERN_DEBUG "%s: Loopback test failed.\n", "Loopback test failed\n");
dev->name);
test->flags |= ETH_TEST_FL_FAILED; test->flags |= ETH_TEST_FL_FAILED;
} else if (netif_msg_hw(lp)) } else
printk(KERN_DEBUG "%s: Loopback test passed.\n", netif_printk(lp, hw, KERN_DEBUG, dev,
dev->name); "Loopback test passed\n");
} else if (netif_msg_hw(lp)) } else
printk(KERN_DEBUG netif_printk(lp, hw, KERN_DEBUG, dev,
"%s: No tests to run (specify 'Offline' on ethtool).", "No tests to run (specify 'Offline' on ethtool)\n");
dev->name);
} /* end pcnet32_ethtool_test */ } /* end pcnet32_ethtool_test */
static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
...@@ -927,10 +909,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) ...@@ -927,10 +909,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
size = data_len + 15; size = data_len + 15;
for (x = 0; x < numbuffs; x++) { for (x = 0; x < numbuffs; x++) {
if (!(skb = dev_alloc_skb(size))) { if (!(skb = dev_alloc_skb(size))) {
if (netif_msg_hw(lp)) netif_printk(lp, hw, KERN_DEBUG, dev,
printk(KERN_DEBUG "Cannot allocate skb at line: %d!\n",
"%s: Cannot allocate skb at line: %d!\n", __LINE__);
dev->name, __LINE__);
goto clean_up; goto clean_up;
} else { } else {
packet = skb->data; packet = skb->data;
...@@ -984,9 +965,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) ...@@ -984,9 +965,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
ticks++; ticks++;
} }
if (ticks == 200) { if (ticks == 200) {
if (netif_msg_hw(lp)) netif_err(lp, hw, dev, "Desc %d failed to reset!\n", x);
printk("%s: Desc %d failed to reset!\n",
dev->name, x);
break; break;
} }
} }
...@@ -994,15 +973,15 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) ...@@ -994,15 +973,15 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */ lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
wmb(); wmb();
if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) { if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name); netdev_printk(KERN_DEBUG, dev, "RX loopback packets:\n");
for (x = 0; x < numbuffs; x++) { for (x = 0; x < numbuffs; x++) {
printk(KERN_DEBUG "%s: Packet %d:\n", dev->name, x); netdev_printk(KERN_DEBUG, dev, "Packet %d: ", x);
skb = lp->rx_skbuff[x]; skb = lp->rx_skbuff[x];
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
printk("%02x ", *(skb->data + i)); pr_cont(" %02x", *(skb->data + i));
} }
printk("\n"); pr_cont("\n");
} }
} }
...@@ -1013,11 +992,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) ...@@ -1013,11 +992,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
packet = lp->tx_skbuff[x]->data; packet = lp->tx_skbuff[x]->data;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (*(skb->data + i) != packet[i]) { if (*(skb->data + i) != packet[i]) {
if (netif_msg_hw(lp)) netif_printk(lp, hw, KERN_DEBUG, dev,
printk(KERN_DEBUG "Error in compare! %2x - %02x %02x\n",
"%s: Error in compare! %2x - %02x %02x\n", i, *(skb->data + i), packet[i]);
dev->name, i, *(skb->data + i),
packet[i]);
rc = 1; rc = 1;
break; break;
} }
...@@ -1136,10 +1113,8 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags, ...@@ -1136,10 +1113,8 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
spin_lock_irqsave(&lp->lock, *flags); spin_lock_irqsave(&lp->lock, *flags);
ticks++; ticks++;
if (ticks > 200) { if (ticks > 200) {
if (netif_msg_hw(lp)) netif_printk(lp, hw, KERN_DEBUG, dev,
printk(KERN_DEBUG "Error getting into suspend!\n");
"%s: Error getting into suspend!\n",
dev->name);
return 0; return 0;
} }
} }
...@@ -1184,15 +1159,13 @@ static void pcnet32_rx_entry(struct net_device *dev, ...@@ -1184,15 +1159,13 @@ static void pcnet32_rx_entry(struct net_device *dev,
/* Discard oversize frames. */ /* Discard oversize frames. */
if (unlikely(pkt_len > PKT_BUF_SIZE)) { if (unlikely(pkt_len > PKT_BUF_SIZE)) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Impossible packet size %d!\n",
printk(KERN_ERR "%s: Impossible packet size %d!\n", pkt_len);
dev->name, pkt_len);
dev->stats.rx_errors++; dev->stats.rx_errors++;
return; return;
} }
if (pkt_len < 60) { if (pkt_len < 60) {
if (netif_msg_rx_err(lp)) netif_err(lp, rx_err, dev, "Runt packet!\n");
printk(KERN_ERR "%s: Runt packet!\n", dev->name);
dev->stats.rx_errors++; dev->stats.rx_errors++;
return; return;
} }
...@@ -1223,10 +1196,7 @@ static void pcnet32_rx_entry(struct net_device *dev, ...@@ -1223,10 +1196,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
} }
if (skb == NULL) { if (skb == NULL) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
printk(KERN_ERR
"%s: Memory squeeze, dropping packet.\n",
dev->name);
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
return; return;
} }
...@@ -1297,11 +1267,9 @@ static int pcnet32_tx(struct net_device *dev) ...@@ -1297,11 +1267,9 @@ static int pcnet32_tx(struct net_device *dev)
/* There was a major error, log it. */ /* There was a major error, log it. */
int err_status = le32_to_cpu(lp->tx_ring[entry].misc); int err_status = le32_to_cpu(lp->tx_ring[entry].misc);
dev->stats.tx_errors++; dev->stats.tx_errors++;
if (netif_msg_tx_err(lp)) netif_err(lp, tx_err, dev,
printk(KERN_ERR "Tx error status=%04x err_status=%08x\n",
"%s: Tx error status=%04x err_status=%08x\n", status, err_status);
dev->name, status,
err_status);
if (err_status & 0x04000000) if (err_status & 0x04000000)
dev->stats.tx_aborted_errors++; dev->stats.tx_aborted_errors++;
if (err_status & 0x08000000) if (err_status & 0x08000000)
...@@ -1313,10 +1281,7 @@ static int pcnet32_tx(struct net_device *dev) ...@@ -1313,10 +1281,7 @@ static int pcnet32_tx(struct net_device *dev)
dev->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
/* Ackk! On FIFO errors the Tx unit is turned off! */ /* Ackk! On FIFO errors the Tx unit is turned off! */
/* Remove this verbosity later! */ /* Remove this verbosity later! */
if (netif_msg_tx_err(lp)) netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
printk(KERN_ERR
"%s: Tx FIFO error!\n",
dev->name);
must_restart = 1; must_restart = 1;
} }
#else #else
...@@ -1325,10 +1290,7 @@ static int pcnet32_tx(struct net_device *dev) ...@@ -1325,10 +1290,7 @@ static int pcnet32_tx(struct net_device *dev)
if (!lp->dxsuflo) { /* If controller doesn't recover ... */ if (!lp->dxsuflo) { /* If controller doesn't recover ... */
/* Ackk! On FIFO errors the Tx unit is turned off! */ /* Ackk! On FIFO errors the Tx unit is turned off! */
/* Remove this verbosity later! */ /* Remove this verbosity later! */
if (netif_msg_tx_err(lp)) netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
printk(KERN_ERR
"%s: Tx FIFO error!\n",
dev->name);
must_restart = 1; must_restart = 1;
} }
} }
...@@ -1354,11 +1316,8 @@ static int pcnet32_tx(struct net_device *dev) ...@@ -1354,11 +1316,8 @@ static int pcnet32_tx(struct net_device *dev)
delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size); delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);
if (delta > lp->tx_ring_size) { if (delta > lp->tx_ring_size) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "out-of-sync dirty pointer, %d vs. %d, full=%d\n",
printk(KERN_ERR dirty_tx, lp->cur_tx, lp->tx_full);
"%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
dev->name, dirty_tx, lp->cur_tx,
lp->tx_full);
dirty_tx += lp->tx_ring_size; dirty_tx += lp->tx_ring_size;
delta -= lp->tx_ring_size; delta -= lp->tx_ring_size;
} }
...@@ -1535,8 +1494,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1535,8 +1494,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err < 0) { if (err < 0) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX pr_err("failed to enable device -- err=%d\n", err);
"failed to enable device -- err=%d\n", err);
return err; return err;
} }
pci_set_master(pdev); pci_set_master(pdev);
...@@ -1544,22 +1502,19 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1544,22 +1502,19 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
ioaddr = pci_resource_start(pdev, 0); ioaddr = pci_resource_start(pdev, 0);
if (!ioaddr) { if (!ioaddr) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX pr_err("card has no PCI IO resources, aborting\n");
"card has no PCI IO resources, aborting\n");
return -ENODEV; return -ENODEV;
} }
if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) { if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX pr_err("architecture does not support 32bit PCI busmaster DMA\n");
"architecture does not support 32bit PCI busmaster DMA\n");
return -ENODEV; return -ENODEV;
} }
if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") == if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") ==
NULL) { NULL) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX pr_err("io address range already allocated\n");
"io address range already allocated\n");
return -EBUSY; return -EBUSY;
} }
...@@ -1616,7 +1571,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1616,7 +1571,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
a = &pcnet32_dwio; a = &pcnet32_dwio;
} else { } else {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX "No access methods\n"); pr_err("No access methods\n");
goto err_release_region; goto err_release_region;
} }
} }
...@@ -1624,11 +1579,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1624,11 +1579,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
chip_version = chip_version =
a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16); a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW)) if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW))
printk(KERN_INFO " PCnet chip version is %#x.\n", pr_info(" PCnet chip version is %#x\n", chip_version);
chip_version);
if ((chip_version & 0xfff) != 0x003) { if ((chip_version & 0xfff) != 0x003) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_INFO PFX "Unsupported chip version.\n"); pr_info("Unsupported chip version\n");
goto err_release_region; goto err_release_region;
} }
...@@ -1681,7 +1635,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1681,7 +1635,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
if (cards_found < MAX_UNITS && homepna[cards_found]) if (cards_found < MAX_UNITS && homepna[cards_found])
media |= 1; /* switch to home wiring mode */ media |= 1; /* switch to home wiring mode */
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_DEBUG PFX "media set to %sMbit mode.\n", printk(KERN_DEBUG PFX "media set to %sMbit mode\n",
(media & 1) ? "1" : "10"); (media & 1) ? "1" : "10");
a->write_bcr(ioaddr, 49, media); a->write_bcr(ioaddr, 49, media);
break; break;
...@@ -1697,8 +1651,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1697,8 +1651,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
break; break;
default: default:
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_INFO PFX pr_info("PCnet version %#x, no PCnet32 chip\n",
"PCnet version %#x, no PCnet32 chip.\n",
chip_version); chip_version);
goto err_release_region; goto err_release_region;
} }
...@@ -1721,7 +1674,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1721,7 +1674,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
dev = alloc_etherdev(sizeof(*lp)); dev = alloc_etherdev(sizeof(*lp));
if (!dev) { if (!dev) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX "Memory allocation failed.\n"); pr_err("Memory allocation failed\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_release_region; goto err_release_region;
} }
...@@ -1730,7 +1683,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1730,7 +1683,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr); pr_info("%s at %#3lx,", chipname, ioaddr);
/* In most chips, after a chip reset, the ethernet address is read from the /* In most chips, after a chip reset, the ethernet address is read from the
* station address PROM at the base address and programmed into the * station address PROM at the base address and programmed into the
...@@ -1755,9 +1708,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1755,9 +1708,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
!is_valid_ether_addr(dev->dev_addr)) { !is_valid_ether_addr(dev->dev_addr)) {
if (is_valid_ether_addr(promaddr)) { if (is_valid_ether_addr(promaddr)) {
if (pcnet32_debug & NETIF_MSG_PROBE) { if (pcnet32_debug & NETIF_MSG_PROBE) {
printk(" warning: CSR address invalid,\n"); pr_cont(" warning: CSR address invalid,\n");
printk(KERN_INFO pr_info(" using instead PROM address of");
" using instead PROM address of");
} }
memcpy(dev->dev_addr, promaddr, 6); memcpy(dev->dev_addr, promaddr, 6);
} }
...@@ -1769,43 +1721,43 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1769,43 +1721,43 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
memset(dev->dev_addr, 0, ETH_ALEN); memset(dev->dev_addr, 0, ETH_ALEN);
if (pcnet32_debug & NETIF_MSG_PROBE) { if (pcnet32_debug & NETIF_MSG_PROBE) {
printk(" %pM", dev->dev_addr); pr_cont(" %pM", dev->dev_addr);
/* Version 0x2623 and 0x2624 */ /* Version 0x2623 and 0x2624 */
if (((chip_version + 1) & 0xfffe) == 0x2624) { if (((chip_version + 1) & 0xfffe) == 0x2624) {
i = a->read_csr(ioaddr, 80) & 0x0C00; /* Check tx_start_pt */ i = a->read_csr(ioaddr, 80) & 0x0C00; /* Check tx_start_pt */
printk(KERN_INFO " tx_start_pt(0x%04x):", i); pr_info(" tx_start_pt(0x%04x):", i);
switch (i >> 10) { switch (i >> 10) {
case 0: case 0:
printk(KERN_CONT " 20 bytes,"); pr_cont(" 20 bytes,");
break; break;
case 1: case 1:
printk(KERN_CONT " 64 bytes,"); pr_cont(" 64 bytes,");
break; break;
case 2: case 2:
printk(KERN_CONT " 128 bytes,"); pr_cont(" 128 bytes,");
break; break;
case 3: case 3:
printk(KERN_CONT "~220 bytes,"); pr_cont("~220 bytes,");
break; break;
} }
i = a->read_bcr(ioaddr, 18); /* Check Burst/Bus control */ i = a->read_bcr(ioaddr, 18); /* Check Burst/Bus control */
printk(KERN_CONT " BCR18(%x):", i & 0xffff); pr_cont(" BCR18(%x):", i & 0xffff);
if (i & (1 << 5)) if (i & (1 << 5))
printk(KERN_CONT "BurstWrEn "); pr_cont("BurstWrEn ");
if (i & (1 << 6)) if (i & (1 << 6))
printk(KERN_CONT "BurstRdEn "); pr_cont("BurstRdEn ");
if (i & (1 << 7)) if (i & (1 << 7))
printk(KERN_CONT "DWordIO "); pr_cont("DWordIO ");
if (i & (1 << 11)) if (i & (1 << 11))
printk(KERN_CONT "NoUFlow "); pr_cont("NoUFlow ");
i = a->read_bcr(ioaddr, 25); i = a->read_bcr(ioaddr, 25);
printk(KERN_INFO " SRAMSIZE=0x%04x,", i << 8); pr_info(" SRAMSIZE=0x%04x,", i << 8);
i = a->read_bcr(ioaddr, 26); i = a->read_bcr(ioaddr, 26);
printk(KERN_CONT " SRAM_BND=0x%04x,", i << 8); pr_cont(" SRAM_BND=0x%04x,", i << 8);
i = a->read_bcr(ioaddr, 27); i = a->read_bcr(ioaddr, 27);
if (i & (1 << 14)) if (i & (1 << 14))
printk(KERN_CONT "LowLatRx"); pr_cont("LowLatRx");
} }
} }
...@@ -1815,8 +1767,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1815,8 +1767,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
if ((lp->init_block = if ((lp->init_block =
pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) { pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_ERR PFX pr_err("Consistent memory allocation failed\n");
"Consistent memory allocation failed.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_free_netdev; goto err_free_netdev;
} }
...@@ -1890,7 +1841,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1890,7 +1841,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
if (pdev) { /* use the IRQ provided by PCI */ if (pdev) { /* use the IRQ provided by PCI */
dev->irq = pdev->irq; dev->irq = pdev->irq;
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(" assigned IRQ %d.\n", dev->irq); pr_cont(" assigned IRQ %d\n", dev->irq);
} else { } else {
unsigned long irq_mask = probe_irq_on(); unsigned long irq_mask = probe_irq_on();
...@@ -1906,12 +1857,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1906,12 +1857,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
dev->irq = probe_irq_off(irq_mask); dev->irq = probe_irq_off(irq_mask);
if (!dev->irq) { if (!dev->irq) {
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(", failed to detect IRQ line.\n"); pr_cont(", failed to detect IRQ line\n");
ret = -ENODEV; ret = -ENODEV;
goto err_free_ring; goto err_free_ring;
} }
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(", probed IRQ %d.\n", dev->irq); pr_cont(", probed IRQ %d\n", dev->irq);
} }
/* Set the mii phy_id so that we can query the link state */ /* Set the mii phy_id so that we can query the link state */
...@@ -1935,8 +1886,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1935,8 +1886,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
lp->phymask |= (1 << i); lp->phymask |= (1 << i);
lp->mii_if.phy_id = i; lp->mii_if.phy_id = i;
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_INFO PFX pr_info("Found PHY %04x:%04x at address %d\n",
"Found PHY %04x:%04x at address %d.\n",
id1, id2, i); id1, id2, i);
} }
lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5); lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
...@@ -1966,7 +1916,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -1966,7 +1916,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
} }
if (pcnet32_debug & NETIF_MSG_PROBE) if (pcnet32_debug & NETIF_MSG_PROBE)
printk(KERN_INFO "%s: registered as %s\n", dev->name, lp->name); pr_info("%s: registered as %s\n", dev->name, lp->name);
cards_found++; cards_found++;
/* enable LED writes */ /* enable LED writes */
...@@ -1995,10 +1945,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name) ...@@ -1995,10 +1945,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
lp->tx_ring_size, lp->tx_ring_size,
&lp->tx_ring_dma_addr); &lp->tx_ring_dma_addr);
if (lp->tx_ring == NULL) { if (lp->tx_ring == NULL) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Consistent memory allocation failed.\n",
name);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2007,46 +1954,35 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name) ...@@ -2007,46 +1954,35 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
lp->rx_ring_size, lp->rx_ring_size,
&lp->rx_ring_dma_addr); &lp->rx_ring_dma_addr);
if (lp->rx_ring == NULL) { if (lp->rx_ring == NULL) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Consistent memory allocation failed.\n",
name);
return -ENOMEM; return -ENOMEM;
} }
lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t), lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
GFP_ATOMIC); GFP_ATOMIC);
if (!lp->tx_dma_addr) { if (!lp->tx_dma_addr) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Memory allocation failed.\n", name);
return -ENOMEM; return -ENOMEM;
} }
lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t), lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
GFP_ATOMIC); GFP_ATOMIC);
if (!lp->rx_dma_addr) { if (!lp->rx_dma_addr) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Memory allocation failed.\n", name);
return -ENOMEM; return -ENOMEM;
} }
lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *), lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
GFP_ATOMIC); GFP_ATOMIC);
if (!lp->tx_skbuff) { if (!lp->tx_skbuff) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Memory allocation failed.\n", name);
return -ENOMEM; return -ENOMEM;
} }
lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *), lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
GFP_ATOMIC); GFP_ATOMIC);
if (!lp->rx_skbuff) { if (!lp->rx_skbuff) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Memory allocation failed\n");
printk(KERN_ERR PFX
"%s: Memory allocation failed.\n", name);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2115,10 +2051,9 @@ static int pcnet32_open(struct net_device *dev) ...@@ -2115,10 +2051,9 @@ static int pcnet32_open(struct net_device *dev)
/* switch pcnet32 to 32bit mode */ /* switch pcnet32 to 32bit mode */
lp->a.write_bcr(ioaddr, 20, 2); lp->a.write_bcr(ioaddr, 20, 2);
if (netif_msg_ifup(lp)) netif_printk(lp, ifup, KERN_DEBUG, dev,
printk(KERN_DEBUG "%s() irq %d tx/rx rings %#x/%#x init %#x\n",
"%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init %#x.\n", __func__, dev->irq, (u32) (lp->tx_ring_dma_addr),
dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
(u32) (lp->rx_ring_dma_addr), (u32) (lp->rx_ring_dma_addr),
(u32) (lp->init_dma_addr)); (u32) (lp->init_dma_addr));
...@@ -2155,10 +2090,8 @@ static int pcnet32_open(struct net_device *dev) ...@@ -2155,10 +2090,8 @@ static int pcnet32_open(struct net_device *dev)
pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) { pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
if (lp->options & PCNET32_PORT_ASEL) { if (lp->options & PCNET32_PORT_ASEL) {
lp->options = PCNET32_PORT_FD | PCNET32_PORT_100; lp->options = PCNET32_PORT_FD | PCNET32_PORT_100;
if (netif_msg_link(lp)) netif_printk(lp, link, KERN_DEBUG, dev,
printk(KERN_DEBUG "Setting 100Mb-Full Duplex\n");
"%s: Setting 100Mb-Full Duplex.\n",
dev->name);
} }
} }
if (lp->phycount < 2) { if (lp->phycount < 2) {
...@@ -2246,9 +2179,7 @@ static int pcnet32_open(struct net_device *dev) ...@@ -2246,9 +2179,7 @@ static int pcnet32_open(struct net_device *dev)
} }
} }
lp->mii_if.phy_id = first_phy; lp->mii_if.phy_id = first_phy;
if (netif_msg_link(lp)) netif_info(lp, link, dev, "Using PHY number %d\n", first_phy);
printk(KERN_INFO "%s: Using PHY number %d.\n",
dev->name, first_phy);
} }
#ifdef DO_DXSUFLO #ifdef DO_DXSUFLO
...@@ -2295,10 +2226,9 @@ static int pcnet32_open(struct net_device *dev) ...@@ -2295,10 +2226,9 @@ static int pcnet32_open(struct net_device *dev)
*/ */
lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL); lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
if (netif_msg_ifup(lp)) netif_printk(lp, ifup, KERN_DEBUG, dev,
printk(KERN_DEBUG "pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n",
"%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n", i,
dev->name, i,
(u32) (lp->init_dma_addr), (u32) (lp->init_dma_addr),
lp->a.read_csr(ioaddr, CSR0)); lp->a.read_csr(ioaddr, CSR0));
...@@ -2371,10 +2301,8 @@ static int pcnet32_init_ring(struct net_device *dev) ...@@ -2371,10 +2301,8 @@ static int pcnet32_init_ring(struct net_device *dev)
(rx_skbuff = lp->rx_skbuff[i] = (rx_skbuff = lp->rx_skbuff[i] =
dev_alloc_skb(PKT_BUF_SKB))) { dev_alloc_skb(PKT_BUF_SKB))) {
/* there is not much, we can do at this point */ /* there is not much, we can do at this point */
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
printk(KERN_ERR __func__);
"%s: pcnet32_init_ring dev_alloc_skb failed.\n",
dev->name);
return -1; return -1;
} }
skb_reserve(rx_skbuff, NET_IP_ALIGN); skb_reserve(rx_skbuff, NET_IP_ALIGN);
...@@ -2424,10 +2352,9 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) ...@@ -2424,10 +2352,9 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP) if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
break; break;
if (i >= 100 && netif_msg_drv(lp)) if (i >= 100)
printk(KERN_ERR netif_err(lp, drv, dev, "%s timed out waiting for stop\n",
"%s: pcnet32_restart timed out waiting for stop.\n", __func__);
dev->name);
pcnet32_purge_tx_ring(dev); pcnet32_purge_tx_ring(dev);
if (pcnet32_init_ring(dev)) if (pcnet32_init_ring(dev))
...@@ -2451,8 +2378,7 @@ static void pcnet32_tx_timeout(struct net_device *dev) ...@@ -2451,8 +2378,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
/* Transmitter timeout, serious problems. */ /* Transmitter timeout, serious problems. */
if (pcnet32_debug & NETIF_MSG_DRV) if (pcnet32_debug & NETIF_MSG_DRV)
printk(KERN_ERR pr_err("%s: transmit timed out, status %4.4x, resetting\n",
"%s: transmit timed out, status %4.4x, resetting.\n",
dev->name, lp->a.read_csr(ioaddr, CSR0)); dev->name, lp->a.read_csr(ioaddr, CSR0));
lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
dev->stats.tx_errors++; dev->stats.tx_errors++;
...@@ -2495,11 +2421,9 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb, ...@@ -2495,11 +2421,9 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
if (netif_msg_tx_queued(lp)) { netif_printk(lp, tx_queued, KERN_DEBUG, dev,
printk(KERN_DEBUG "%s() called, csr0 %4.4x\n",
"%s: pcnet32_start_xmit() called, csr0 %4.4x.\n", __func__, lp->a.read_csr(ioaddr, CSR0));
dev->name, lp->a.read_csr(ioaddr, CSR0));
}
/* Default status -- will not enable Successful-TxDone /* Default status -- will not enable Successful-TxDone
* interrupt when that option is available to us. * interrupt when that option is available to us.
...@@ -2564,10 +2488,9 @@ pcnet32_interrupt(int irq, void *dev_id) ...@@ -2564,10 +2488,9 @@ pcnet32_interrupt(int irq, void *dev_id)
/* Acknowledge all of the current interrupt sources ASAP. */ /* Acknowledge all of the current interrupt sources ASAP. */
lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f); lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
if (netif_msg_intr(lp)) netif_printk(lp, intr, KERN_DEBUG, dev,
printk(KERN_DEBUG "interrupt csr0=%#2.2x new csr=%#2.2x\n",
"%s: interrupt csr0=%#2.2x new csr=%#2.2x.\n", csr0, lp->a.read_csr(ioaddr, CSR0));
dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
/* Log misc errors. */ /* Log misc errors. */
if (csr0 & 0x4000) if (csr0 & 0x4000)
...@@ -2587,10 +2510,8 @@ pcnet32_interrupt(int irq, void *dev_id) ...@@ -2587,10 +2510,8 @@ pcnet32_interrupt(int irq, void *dev_id)
dev->stats.rx_errors++; /* Missed a Rx frame. */ dev->stats.rx_errors++; /* Missed a Rx frame. */
} }
if (csr0 & 0x0800) { if (csr0 & 0x0800) {
if (netif_msg_drv(lp)) netif_err(lp, drv, dev, "Bus master arbitration failure, status %4.4x\n",
printk(KERN_ERR csr0);
"%s: Bus master arbitration failure, status %4.4x.\n",
dev->name, csr0);
/* unlike for the lance, there is no restart needed */ /* unlike for the lance, there is no restart needed */
} }
if (napi_schedule_prep(&lp->napi)) { if (napi_schedule_prep(&lp->napi)) {
...@@ -2606,9 +2527,9 @@ pcnet32_interrupt(int irq, void *dev_id) ...@@ -2606,9 +2527,9 @@ pcnet32_interrupt(int irq, void *dev_id)
csr0 = lp->a.read_csr(ioaddr, CSR0); csr0 = lp->a.read_csr(ioaddr, CSR0);
} }
if (netif_msg_intr(lp)) netif_printk(lp, intr, KERN_DEBUG, dev,
printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n", "exiting interrupt, csr0=%#4.4x\n",
dev->name, lp->a.read_csr(ioaddr, CSR0)); lp->a.read_csr(ioaddr, CSR0));
spin_unlock(&lp->lock); spin_unlock(&lp->lock);
...@@ -2630,10 +2551,9 @@ static int pcnet32_close(struct net_device *dev) ...@@ -2630,10 +2551,9 @@ static int pcnet32_close(struct net_device *dev)
dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112); dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
if (netif_msg_ifdown(lp)) netif_printk(lp, ifdown, KERN_DEBUG, dev,
printk(KERN_DEBUG "Shutting down ethercard, status was %2.2x\n",
"%s: Shutting down ethercard, status was %2.2x.\n", lp->a.read_csr(ioaddr, CSR0));
dev->name, lp->a.read_csr(ioaddr, CSR0));
/* We stop the PCNET32 here -- it occasionally polls memory if we don't. */ /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
...@@ -2730,9 +2650,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev) ...@@ -2730,9 +2650,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
csr15 = lp->a.read_csr(ioaddr, CSR15); csr15 = lp->a.read_csr(ioaddr, CSR15);
if (dev->flags & IFF_PROMISC) { if (dev->flags & IFF_PROMISC) {
/* Log any net taps. */ /* Log any net taps. */
if (netif_msg_hw(lp)) netif_info(lp, hw, dev, "Promiscuous mode enabled\n");
printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
dev->name);
lp->init_block->mode = lp->init_block->mode =
cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) << cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
7); 7);
...@@ -2819,10 +2737,8 @@ static int pcnet32_check_otherphy(struct net_device *dev) ...@@ -2819,10 +2737,8 @@ static int pcnet32_check_otherphy(struct net_device *dev)
mii.phy_id = i; mii.phy_id = i;
if (mii_link_ok(&mii)) { if (mii_link_ok(&mii)) {
/* found PHY with active link */ /* found PHY with active link */
if (netif_msg_link(lp)) netif_info(lp, link, dev, "Using PHY number %d\n",
printk(KERN_INFO i);
"%s: Using PHY number %d.\n",
dev->name, i);
/* isolate inactive phy */ /* isolate inactive phy */
bmcr = bmcr =
...@@ -2868,8 +2784,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose) ...@@ -2868,8 +2784,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
if (!curr_link) { if (!curr_link) {
if (prev_link || verbose) { if (prev_link || verbose) {
netif_carrier_off(dev); netif_carrier_off(dev);
if (netif_msg_link(lp)) netif_info(lp, link, dev, "link down\n");
printk(KERN_INFO "%s: link down\n", dev->name);
} }
if (lp->phycount > 1) { if (lp->phycount > 1) {
curr_link = pcnet32_check_otherphy(dev); curr_link = pcnet32_check_otherphy(dev);
...@@ -2881,12 +2796,11 @@ static void pcnet32_check_media(struct net_device *dev, int verbose) ...@@ -2881,12 +2796,11 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
if (netif_msg_link(lp)) { if (netif_msg_link(lp)) {
struct ethtool_cmd ecmd; struct ethtool_cmd ecmd;
mii_ethtool_gset(&lp->mii_if, &ecmd); mii_ethtool_gset(&lp->mii_if, &ecmd);
printk(KERN_INFO netdev_info(dev, "link up, %sMbps, %s-duplex\n",
"%s: link up, %sMbps, %s-duplex\n", (ecmd.speed == SPEED_100)
dev->name, ? "100" : "10",
(ecmd.speed == SPEED_100) ? "100" : "10", (ecmd.duplex == DUPLEX_FULL)
(ecmd.duplex == ? "full" : "half");
DUPLEX_FULL) ? "full" : "half");
} }
bcr9 = lp->a.read_bcr(dev->base_addr, 9); bcr9 = lp->a.read_bcr(dev->base_addr, 9);
if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) { if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
...@@ -2897,8 +2811,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose) ...@@ -2897,8 +2811,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
lp->a.write_bcr(dev->base_addr, 9, bcr9); lp->a.write_bcr(dev->base_addr, 9, bcr9);
} }
} else { } else {
if (netif_msg_link(lp)) netif_info(lp, link, dev, "link up\n");
printk(KERN_INFO "%s: link up\n", dev->name);
} }
} }
} }
...@@ -3010,7 +2923,7 @@ MODULE_LICENSE("GPL"); ...@@ -3010,7 +2923,7 @@ MODULE_LICENSE("GPL");
static int __init pcnet32_init_module(void) static int __init pcnet32_init_module(void)
{ {
printk(KERN_INFO "%s", version); pr_info("%s", version);
pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT); pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
...@@ -3026,7 +2939,7 @@ static int __init pcnet32_init_module(void) ...@@ -3026,7 +2939,7 @@ static int __init pcnet32_init_module(void)
pcnet32_probe_vlbus(pcnet32_portlist); pcnet32_probe_vlbus(pcnet32_portlist);
if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE)) if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
printk(KERN_INFO PFX "%d cards_found.\n", cards_found); pr_info("%d cards_found\n", cards_found);
return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV; return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7