From 687f76738aaec14a505ae22fcd35ada47f09e40a Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 1 Nov 2007 00:52:13 -0700
Subject: [PATCH] --- yaml --- r: 78927 b: refs/heads/master c:
 3627947e84dd2f6dbfd01f796139949f65a43b31 h: refs/heads/master i:   78925:
 f9a32b6b6939bf8307c5ef5e8c641ca9bf3a992a   78923:
 eae0e9d8718ae071741549047cb8372207ca27e7   78919:
 8f1e0c9e361c9e60aee8d7ce2ecad9c96ce6de35   78911:
 d46a6a0b243030973150599658ba45bfba5e6025 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/sundance.c | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 12594f9adceb..4d932b8b22ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 993fb90c5b1727342362c43ed4e29c26682f54f7
+refs/heads/master: 3627947e84dd2f6dbfd01f796139949f65a43b31
diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c
index 0a6186d4a48e..7d5561b8241c 100644
--- a/trunk/drivers/net/sundance.c
+++ b/trunk/drivers/net/sundance.c
@@ -1596,9 +1596,7 @@ static const struct ethtool_ops ethtool_ops = {
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
 	struct netdev_private *np = netdev_priv(dev);
-	void __iomem *ioaddr = np->base;
 	int rc;
-	int i;
 
 	if (!netif_running(dev))
 		return -EINVAL;
@@ -1606,30 +1604,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	spin_lock_irq(&np->lock);
 	rc = generic_mii_ioctl(&np->mii_if, if_mii(rq), cmd, NULL);
 	spin_unlock_irq(&np->lock);
-	switch (cmd) {
-		case SIOCDEVPRIVATE:
-		for (i=0; i<TX_RING_SIZE; i++) {
-			printk(KERN_DEBUG "%02x %08llx %08x %08x(%02x) %08x %08x\n", i,
-				(unsigned long long)(np->tx_ring_dma + i*sizeof(*np->tx_ring)),
-				le32_to_cpu(np->tx_ring[i].next_desc),
-				le32_to_cpu(np->tx_ring[i].status),
-				(le32_to_cpu(np->tx_ring[i].status) >> 2)
-					& 0xff,
-				le32_to_cpu(np->tx_ring[i].frag[0].addr),
-				le32_to_cpu(np->tx_ring[i].frag[0].length));
-		}
-		printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n",
-			ioread32(np->base + TxListPtr),
-			netif_queue_stopped(dev));
-		printk(KERN_DEBUG "cur_tx=%d(%02x) dirty_tx=%d(%02x)\n",
-			np->cur_tx, np->cur_tx % TX_RING_SIZE,
-			np->dirty_tx, np->dirty_tx % TX_RING_SIZE);
-		printk(KERN_DEBUG "cur_rx=%d dirty_rx=%d\n", np->cur_rx, np->dirty_rx);
-		printk(KERN_DEBUG "cur_task=%d\n", np->cur_task);
-		printk(KERN_DEBUG "TxStatus=%04x\n", ioread16(ioaddr + TxStatus));
-			return 0;
-	}
-
 
 	return rc;
 }