From: Finn Thain <fthain@telegraphics.com.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net v2 2/9] net/mac89x0: Remove dead or unreachable code
Date: Thu, 5 Oct 2017 21:11:05 -0400 (EDT) [thread overview]
Message-ID: <5344064de2d98cbcd38b60ad6c744a28faed00bd.1507211120.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1507211120.git.fthain@telegraphics.com.au>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
drivers/net/ethernet/cirrus/mac89x0.c | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index f910f0f386d6..4fd72c1a69f5 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -119,10 +119,6 @@ struct net_local {
};
/* Index to functions, as function prototypes. */
-
-#if 0
-extern void reset_chip(struct net_device *dev);
-#endif
static int net_open(struct net_device *dev);
static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t net_interrupt(int irq, void *dev_id);
@@ -132,10 +128,6 @@ static int net_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static int set_mac_address(struct net_device *dev, void *addr);
-
-/* Example routines you must write ;->. */
-#define tx_done(dev) 1
-
/* For reading/writing registers ISA-style */
static inline int
readreg_io(struct net_device *dev, int portno)
@@ -295,24 +287,6 @@ struct net_device * __init mac89x0_probe(int unit)
return ERR_PTR(err);
}
-#if 0
-/* This is useful for something, but I don't know what yet. */
-void __init reset_chip(struct net_device *dev)
-{
- int reset_start_time;
-
- writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
-
- /* wait 30 ms */
- msleep_interruptible(30);
-
- /* Wait until the chip is reset */
- reset_start_time = jiffies;
- while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 && jiffies - reset_start_time < 2)
- ;
-}
-#endif
-
/* Open/initialize the board. This is called (in the current kernel)
sometime after booting when the 'ifconfig' program is run.
@@ -414,11 +388,6 @@ static irqreturn_t net_interrupt(int irq, void *dev_id)
struct net_local *lp;
int ioaddr, status;
- if (dev == NULL) {
- printk ("net_interrupt(): irq %d for unknown device.\n", irq);
- return IRQ_NONE;
- }
-
ioaddr = dev->base_addr;
lp = netdev_priv(dev);
--
2.13.5
next prev parent reply other threads:[~2017-10-06 1:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 1:11 [PATCH net v2 0/9] Fixes, cleanup and modernization for some legacy ethernet NIC drivers Finn Thain
2017-10-06 1:11 ` Finn Thain [this message]
2017-10-06 1:11 ` [PATCH net v2 6/9] net/sonic: Cleanup and modernize log messages Finn Thain
2017-10-06 1:11 ` [PATCH net v2 8/9] net/8390: Fix redundant code Finn Thain
2017-10-06 1:11 ` [PATCH net v2 1/9] net/smc9194: Remove bogus CONFIG_MAC reference Finn Thain
2017-10-06 1:11 ` [PATCH net v2 3/9] net/mac89x0: Fix and modernize log messages Finn Thain
2017-10-06 4:08 ` David Miller
2017-10-06 11:06 ` Finn Thain
2017-10-06 1:11 ` [PATCH net v2 7/9] net/sonic: Replace custom debug logging with netif_* calls Finn Thain
2017-10-06 1:11 ` [PATCH net v2 4/9] net/mac89x0: " Finn Thain
2017-10-06 1:11 ` [PATCH net v2 9/9] net/mac8390: Fix log messages Finn Thain
2017-10-06 1:11 ` [PATCH net v2 5/9] net/macmace: Fix and cleanup " Finn Thain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5344064de2d98cbcd38b60ad6c744a28faed00bd.1507211120.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®