linux-kernel.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-kernel@vger.kernel.org
Subject: [PATCH net v3 06/12] net/mac89x0: Remove dead or unreachable code
Date: Sat, 11 Nov 2017 01:20:59 -0500 (EST)	[thread overview]
Message-ID: <4e7a48730024b368ce34106424d723645d983468.1510377340.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1510377340.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 8a23d2fc0e28..c1a3d1aed037 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -121,10 +121,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);
@@ -134,10 +130,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)
@@ -293,24 +285,6 @@ static int mac89x0_device_probe(struct platform_device *pdev)
 	return 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.
 
@@ -412,11 +386,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:[~2017-11-11  6:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-11  6:20 [PATCH net v3 00/12] Fixes, cleanup and modernization for some legacy ethernet NIC drivers Finn Thain
2017-11-11  6:20 ` [PATCH net v3 01/12] net/macsonic: Convert to nubus_driver Finn Thain
2017-11-11  6:20 ` [PATCH net v3 04/12] net/sonic: Clean up and modernize log messages Finn Thain
2017-11-11  6:20 ` [PATCH net v3 03/12] net/mac8390: Convert to nubus_driver Finn Thain
2017-11-11  6:20 ` [PATCH net v3 02/12] net/mac89x0: Convert to platform_driver Finn Thain
2017-11-11  6:20 ` [PATCH net v3 08/12] net/mac89x0: Replace custom debug logging with netif_* calls Finn Thain
2017-11-11  6:20 ` [PATCH net v3 05/12] net/sonic: " Finn Thain
2017-11-11  6:20 ` [PATCH net v3 10/12] net/mac8390: Fix log messages Finn Thain
2017-11-11  6:20 ` [PATCH net v3 09/12] net/8390: Fix redundant code Finn Thain
2017-11-11  6:20 ` [PATCH net v3 12/12] net/smc9194: Remove bogus CONFIG_MAC reference Finn Thain
2017-11-11  6:20 ` [PATCH net v3 07/12] net/mac89x0: Fix and modernize log messages Finn Thain
2017-11-11  6:20 ` [PATCH net v3 11/12] net/macmace: Fix and clean up " Finn Thain
2017-11-11  6:20 ` Finn Thain [this message]
2017-11-11 12:39 ` [PATCH net v3 00/12] Fixes, cleanup and modernization for some legacy ethernet NIC drivers David Miller

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=4e7a48730024b368ce34106424d723645d983468.1510377340.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;
as well as URLs for NNTP newsgroup(s).