---------- Forwarded message ---------
Von: Garrit Franke <garritfranke@xxxxxxxxx>
Date: Do., 11. Juni 2020 um 23:38 Uhr
Subject: [PATCH] sgi: remove unreachable debug output
To: <davem@xxxxxxxxxxxxx>, <kuba@xxxxxxxxxx>, <kernel-janitors@xxxxxxxxxxxxxxx>
Cc: Garrit Franke <garritfranke@xxxxxxxxx>
Hi all,
this patch aims to clean up an unused DPRINTK macro inside meth.c, and
replace it with pr_debug from kernel.h.
Thanks for your time,
Garrit
Signed-off-by: Garrit Franke <garritfranke@xxxxxxxxx>
---
drivers/net/ethernet/sgi/meth.c | 92 +++++----------------------------
1 file changed, 12 insertions(+), 80 deletions(-)
diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c
index 0c396ecd3..242f74772 100644
--- a/drivers/net/ethernet/sgi/meth.c
+++ b/drivers/net/ethernet/sgi/meth.c
@@ -32,19 +32,6 @@
#include "meth.h"
-#ifndef MFE_DEBUG
-#define MFE_DEBUG 0
-#endif
-
-#if MFE_DEBUG>=1
-#define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str,
__func__ , ## args)
-#define MFE_RX_DEBUG 2
-#else
-#define DPRINTK(str,args...)
-#define MFE_RX_DEBUG 0
-#endif
-
-
static const char *meth_str="SGI O2 Fast Ethernet";
/* The maximum time waited (in jiffies) before assuming a Tx failed. (400ms) */
@@ -101,7 +88,7 @@ static inline void load_eaddr(struct net_device *dev)
int i;
u64 macaddr;
- DPRINTK("Loading MAC Address: %pM\n", dev->dev_addr);
+ pr_debug("Loading MAC Address: %pM\n", dev->dev_addr);
macaddr = 0;
for (i = 0; i < 6; i++)
macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8);
@@ -141,24 +128,8 @@ static int mdio_probe(struct meth_private *priv)
priv->phy_addr=i;
p2=mdio_read(priv,2);
p3=mdio_read(priv,3);
-#if MFE_DEBUG>=2
- switch ((p2<<12)|(p3>>4)){
- case PHY_QS6612X:
- DPRINTK("PHY is QS6612X\n");
- break;
- case PHY_ICS1889:
- DPRINTK("PHY is ICS1889\n");
- break;
- case PHY_ICS1890:
- DPRINTK("PHY is ICS1890\n");
- break;
- case PHY_DP83840:
- DPRINTK("PHY is DP83840\n");
- break;
- }
-#endif
if(p2!=0xffff&&p2!=0x0000){
- DPRINTK("PHY code: %x\n",(p2<<12)|(p3>>4));
+ pr_debug("PHY code: %x\n", (p2 << 12) | (p3 >> 4));
break;
}
}
@@ -166,7 +137,7 @@ static int mdio_probe(struct meth_private *priv)
if(priv->phy_addr<32) {
return 0;
}
- DPRINTK("Oopsie! PHY is not known!\n");
+ pr_debug("Oopsie! PHY is not known!\n");
priv->phy_addr=-1;
return -ENODEV;
}
@@ -187,7 +158,7 @@ static void meth_check_link(struct net_device *dev)
METH_PHY_FDX : 0;
if ((priv->mac_ctrl & METH_PHY_FDX) ^ duplex) {
- DPRINTK("Setting %s-duplex\n", duplex ? "full" : "half");
+ pr_debug("Setting %s-duplex\n", duplex ? "full" : "half");
if (duplex)
priv->mac_ctrl |= METH_PHY_FDX;
else
@@ -196,7 +167,7 @@ static void meth_check_link(struct net_device *dev)
}
if ((priv->mac_ctrl & METH_100MBIT) ^ speed) {
- DPRINTK("Setting %dMbs mode\n", speed ? 100 : 10);
+ pr_debug("Setting %dMbs mode\n", speed ? 100 : 10);
if (duplex)
priv->mac_ctrl |= METH_100MBIT;
else
@@ -284,7 +255,7 @@ int meth_reset(struct net_device *dev)
/* Check for device */
if (mdio_probe(priv) < 0) {
- DPRINTK("Unable to find PHY\n");
+ pr_debug("Unable to find PHY\n");
return -ENODEV;
}
@@ -341,7 +312,7 @@ static int meth_open(struct net_device *dev)
METH_DMA_RX_EN | METH_DMA_RX_INT_EN;
mace->eth.dma_ctrl = priv->dma_ctrl;
- DPRINTK("About to start queue\n");
+ pr_debug("About to start queue\n");
netif_start_queue(dev);
return 0;
@@ -358,7 +329,7 @@ static int meth_release(struct net_device *dev)
{
struct meth_private *priv = netdev_priv(dev);
- DPRINTK("Stopping queue\n");
+ pr_debug("Stopping queue\n");
netif_stop_queue(dev); /* can't transmit any more */
/* shut down DMA */
priv->dma_ctrl &= ~(METH_DMA_TX_EN | METH_DMA_TX_INT_EN |
@@ -394,11 +365,7 @@ static void meth_rx(struct net_device* dev,
unsigned long int_status)
priv->rx_ring_dmas[priv->rx_write],
METH_RX_BUFF_SIZE, DMA_FROM_DEVICE);
status = priv->rx_ring[priv->rx_write]->status.raw;
-#if MFE_DEBUG
- if (!(status & METH_RX_ST_VALID)) {
- DPRINTK("Not received? status=%016lx\n",status);
- }
-#endif
+
if ((!(status & METH_RX_STATUS_ERRORS)) && (status &
METH_RX_ST_VALID)) {
int len = (status & 0xffff) - 4; /* omit CRC */
/* length sanity check */
@@ -413,7 +380,7 @@ static void meth_rx(struct net_device* dev,
unsigned long int_status)
skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC);
if (!skb) {
/* Ouch! No memory! Drop
packet on the floor */
- DPRINTK("No mem: dropping packet\n");
+ pr_debug("No mem: dropping packet\n");
dev->stats.rx_dropped++;
skb = priv->rx_skbs[priv->rx_write];
} else {
@@ -433,21 +400,6 @@ static void meth_rx(struct net_device* dev,
unsigned long int_status)
} else {
dev->stats.rx_errors++;
skb=priv->rx_skbs[priv->rx_write];
-#if MFE_DEBUG>0
- printk(KERN_WARNING "meth: RX error:
status=0x%016lx\n",status);
- if(status&METH_RX_ST_RCV_CODE_VIOLATION)
- printk(KERN_WARNING "Receive Code Violation\n");
- if(status&METH_RX_ST_CRC_ERR)
- printk(KERN_WARNING "CRC error\n");
- if(status&METH_RX_ST_INV_PREAMBLE_CTX)
- printk(KERN_WARNING "Invalid Preamble
Context\n");
- if(status&METH_RX_ST_LONG_EVT_SEEN)
- printk(KERN_WARNING "Long Event Seen...\n");
- if(status&METH_RX_ST_BAD_PACKET)
- printk(KERN_WARNING "Bad Packet\n");
- if(status&METH_RX_ST_CARRIER_EVT_SEEN)
- printk(KERN_WARNING "Carrier Event Seen\n");
-#endif
}
priv->rx_ring[priv->rx_write] = (rx_packet*)skb->head;
priv->rx_ring[priv->rx_write]->status.raw = 0;
@@ -489,35 +441,15 @@ static void meth_tx_cleanup(struct net_device*
dev, unsigned long int_status)
while (priv->tx_read != rptr) {
skb = priv->tx_skbs[priv->tx_read];
status = priv->tx_ring[priv->tx_read].header.raw;
-#if MFE_DEBUG>=1
- if (priv->tx_read == priv->tx_write)
- DPRINTK("Auchi!
tx_read=%d,tx_write=%d,rptr=%d?\n", priv->tx_read,
priv->tx_write,rptr);
-#endif
if (status & METH_TX_ST_DONE) {
if (status & METH_TX_ST_SUCCESS){
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
} else {
dev->stats.tx_errors++;
-#if MFE_DEBUG>=1
- DPRINTK("TX error: status=%016lx <",status);
- if(status & METH_TX_ST_SUCCESS)
- printk(" SUCCESS");
- if(status & METH_TX_ST_TOOLONG)
- printk(" TOOLONG");
- if(status & METH_TX_ST_UNDERRUN)
- printk(" UNDERRUN");
- if(status & METH_TX_ST_EXCCOLL)
- printk(" EXCCOLL");
- if(status & METH_TX_ST_DEFER)
- printk(" DEFER");
- if(status & METH_TX_ST_LATECOLL)
- printk(" LATECOLL");
- printk(" >\n");
-#endif
}
} else {
- DPRINTK("RPTR points us here, but packet not done?\n");
+ pr_debug("RPTR points us here, but packet not done?\n");
break;
}
dev_consume_skb_irq(skb);
@@ -561,7 +493,7 @@ static void meth_error(struct net_device* dev,
unsigned status)
* Thus I stop processing Rx in this case. */
priv->dma_ctrl &= ~METH_DMA_RX_EN;
mace->eth.dma_ctrl = priv->dma_ctrl;
- DPRINTK("Disabled meth Rx DMA temporarily\n");
+ pr_debug("Disabled meth Rx DMA temporarily\n");
spin_unlock_irqrestore(&priv->meth_lock, flags);
}
mace->eth.int_stat = METH_INT_ERROR;
--
2.25.1
