linux-m68k.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Finn Thain <fthain@telegraphics.com.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-m68k@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH net v4 05/13] net/mac89x0: Remove dead or unreachable code
Date: Sun, 11 Feb 2018 22:08:43 -0500 (EST)	[thread overview]
Message-ID: <6b7aee29e4458fdb07fd9586f600809ca941b28c.1518397634.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1518397634.git.fthain@telegraphics.com.au>

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
 drivers/net/ethernet/cirrus/mac89x0.c | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 977d4c2c759d..4fe0ae93ab36 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -115,14 +115,9 @@ struct net_local {
 	int rx_mode;
 	int curr_rx_cfg;
         int send_underrun;      /* keep track of how many underruns in a row we get */
-	struct sk_buff *skb;
 };
 
 /* 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 +127,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)
@@ -297,24 +288,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.
 
@@ -416,11 +389,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.6

  parent reply	other threads:[~2018-02-12  3:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-12  3:08 [PATCH net v4 00/13] Fixes, cleanup and modernization for some legacy ethernet NIC drivers Finn Thain
2018-02-12  3:08 ` [PATCH net v4 08/13] net/mac89x0: Replace custom debug logging with netif_* calls Finn Thain
2018-02-12  3:08 ` [PATCH net v4 01/13] net/8390: Remove redundant make dependencies Finn Thain
2018-02-12  8:16   ` Geert Uytterhoeven
2018-02-12  3:08 ` [PATCH net v4 10/13] net/mac8390: Fix log messages Finn Thain
2018-02-12  3:08 ` [PATCH net v4 04/13] net/macmace: Fix and clean up " Finn Thain
2018-02-12  3:08 ` [PATCH net v4 11/13] net/macsonic: Convert to nubus_driver Finn Thain
2018-02-12  3:08 ` [PATCH net v4 02/13] net/8390: Fix msg_enable patch snafu Finn Thain
2018-02-12 15:39   ` David Miller
2018-02-13  5:03     ` Finn Thain
2018-02-13 14:58       ` David Miller
2018-02-14 22:11         ` Finn Thain
2018-02-14 22:15           ` David Miller
2018-02-16  3:47             ` Finn Thain
2018-02-12  3:08 ` [PATCH net v4 06/13] net/mac89x0: Convert to platform_driver Finn Thain
2018-02-12  8:25   ` Geert Uytterhoeven
2018-02-12  3:08 ` [PATCH net v4 07/13] net/mac89x0: Fix and modernize log messages Finn Thain
2018-02-12  3:08 ` Finn Thain [this message]
2018-02-12  3:08 ` [PATCH net v4 03/13] net/smc9194: Remove bogus CONFIG_MAC reference Finn Thain
2018-02-12  3:08 ` [PATCH net v4 09/13] net/mac8390: Convert to nubus_driver Finn Thain
2018-02-12  8:29   ` Geert Uytterhoeven
2018-02-13  5:03     ` Finn Thain
2018-02-12  3:08 ` [PATCH net v4 12/13] net/sonic: Clean up and modernize log messages Finn Thain
2018-02-12  3:08 ` [PATCH net v4 13/13] net/sonic: Replace custom debug logging with netif_* calls 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=6b7aee29e4458fdb07fd9586f600809ca941b28c.1518397634.git.fthain@telegraphics.com.au \
    --to=fthain@telegraphics.com.au \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@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;
as well as URLs for NNTP newsgroup(s).