From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH net-next 04/15] drivers/net: delete old parallel port de600/de620 drivers
Date: Mon, 21 Jan 2013 20:46:11 -0500 [thread overview]
Message-ID: <1358819182-28032-5-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1358819182-28032-1-git-send-email-paul.gortmaker@windriver.com>
The parallel port is largely replaced by USB, and even in the
day where these drivers were current, the documented speed was
less than 100kB/s. Let us not pretend that anyone cares about
these drivers anymore, or worse - pretend that anyone is using
them on a modern kernel.
As a side bonus, this is the end of legacy parallel port ethernet,
so we get to drop the whole chunk relating to that in the legacy
Space.c file containing the non-PCI unified probe dispatch.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
Documentation/networking/DLINK.txt | 203 --------
drivers/net/Space.c | 13 +-
drivers/net/ethernet/dlink/Kconfig | 32 +-
drivers/net/ethernet/dlink/Makefile | 2 -
drivers/net/ethernet/dlink/de600.c | 529 -------------------
drivers/net/ethernet/dlink/de600.h | 168 ------
drivers/net/ethernet/dlink/de620.c | 987 ------------------------------------
drivers/net/ethernet/dlink/de620.h | 117 -----
8 files changed, 2 insertions(+), 2049 deletions(-)
delete mode 100644 Documentation/networking/DLINK.txt
delete mode 100644 drivers/net/ethernet/dlink/de600.c
delete mode 100644 drivers/net/ethernet/dlink/de600.h
delete mode 100644 drivers/net/ethernet/dlink/de620.c
delete mode 100644 drivers/net/ethernet/dlink/de620.h
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
deleted file mode 100644
index 55d2443..0000000
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 64cd86e..d487127 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -73,9 +73,6 @@ extern struct net_device *mac89x0_probe(int unit);
extern struct net_device *cops_probe(int unit);
extern struct net_device *ltpc_probe(void);
-/* Detachable devices ("pocket adaptors") */
-extern struct net_device *de620_probe(int unit);
-
/* Fibre Channel adapters */
extern int iph5526_probe(struct net_device *dev);
@@ -185,13 +182,6 @@ static struct devprobe2 isa_probes[] __initdata = {
{NULL, 0},
};
-static struct devprobe2 parport_probes[] __initdata = {
-#ifdef CONFIG_DE620 /* D-Link DE-620 adapter */
- {de620_probe, 0},
-#endif
- {NULL, 0},
-};
-
static struct devprobe2 m68k_probes[] __initdata = {
#ifdef CONFIG_ATARILANCE /* Lance-based Atari ethernet boards */
{atarilance_probe, 0},
@@ -230,8 +220,7 @@ static void __init ethif_probe2(int unit)
return;
(void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
- probe_list2(unit, isa_probes, base_addr == 0) &&
- probe_list2(unit, parport_probes, base_addr == 0));
+ probe_list2(unit, isa_probes, base_addr == 0));
}
/* Statically configured drivers -- order matters here. */
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig
index b5afe21..ee26ce7 100644
--- a/drivers/net/ethernet/dlink/Kconfig
+++ b/drivers/net/ethernet/dlink/Kconfig
@@ -5,7 +5,7 @@
config NET_VENDOR_DLINK
bool "D-Link devices"
default y
- depends on PCI || PARPORT
+ depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -18,36 +18,6 @@ config NET_VENDOR_DLINK
if NET_VENDOR_DLINK
-config DE600
- tristate "D-Link DE600 pocket adapter support"
- depends on PARPORT
- ---help---
- This is a network (Ethernet) device which attaches to your parallel
- port. Read <file:Documentation/networking/DLINK.txt> as well as the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, if you want to use
- this. It is possible to have several devices share a single parallel
- port and it is safe to compile the corresponding drivers into the
- kernel.
-
- To compile this driver as a module, choose M here: the module
- will be called de600.
-
-config DE620
- tristate "D-Link DE620 pocket adapter support"
- depends on PARPORT
- ---help---
- This is a network (Ethernet) device which attaches to your parallel
- port. Read <file:Documentation/networking/DLINK.txt> as well as the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>, if you want to use
- this. It is possible to have several devices share a single parallel
- port and it is safe to compile the corresponding drivers into the
- kernel.
-
- To compile this driver as a module, choose M here: the module
- will be called de620.
-
config DL2K
tristate "DL2000/TC902x-based Gigabit Ethernet support"
depends on PCI
diff --git a/drivers/net/ethernet/dlink/Makefile b/drivers/net/ethernet/dlink/Makefile
index c705eaa..40085f6 100644
--- a/drivers/net/ethernet/dlink/Makefile
+++ b/drivers/net/ethernet/dlink/Makefile
@@ -2,7 +2,5 @@
# Makefile for the D-Link network device drivers.
#
-obj-$(CONFIG_DE600) += de600.o
-obj-$(CONFIG_DE620) += de620.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_SUNDANCE) += sundance.o
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c
deleted file mode 100644
index 414f0ee..0000000
diff --git a/drivers/net/ethernet/dlink/de600.h b/drivers/net/ethernet/dlink/de600.h
deleted file mode 100644
index e80ecba..0000000
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c
deleted file mode 100644
index 2e2bc60..0000000
diff --git a/drivers/net/ethernet/dlink/de620.h b/drivers/net/ethernet/dlink/de620.h
deleted file mode 100644
index e8d9a88..0000000
--
1.8.1
next prev parent reply other threads:[~2013-01-22 1:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 1:46 [PATCH RFC net-next 00/15] drivers/net: obsolete ISA driver round-up Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 01/15] drivers/net: delete 486 Apricot support Paul Gortmaker
2013-01-22 15:51 ` Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 02/15] drivers/net: delete intel 486 panther onboard ethernet support Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 03/15] drivers/net: delete old 8bit ISA 3c501 driver Paul Gortmaker
2013-01-22 1:46 ` Paul Gortmaker [this message]
2013-01-22 1:46 ` [PATCH net-next 05/15] drivers/net: delete the 3Com 3c505/3c507 intel i825xx support Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 06/15] drivers/net: delete ISA intel eexpress and eepro i825xx drivers Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 07/15] drivers/net: delete intel i825xx based znet notebook driver Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 08/15] drivers/net: delete Racal Interlan ISA ni52 (i825xx) driver Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 09/15] drivers/net: delete old 8 bit ISA Racal ni5010 support Paul Gortmaker
2013-01-22 19:59 ` Jan-Pascal van Best
2013-01-22 20:55 ` Ondrej Zary
2013-01-23 3:27 ` Andreas Mohr
2013-01-22 1:46 ` [PATCH net-next 10/15] drivers/net: delete at1700 ISA 10Mbit driver Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 11/15] drivers/net: delete old fujitsu based eth16i driver Paul Gortmaker
2013-01-22 9:26 ` David Laight
2013-01-22 1:46 ` [PATCH net-next 12/15] drivers/net: delete the really obsolete 8390 based 10Mbit ISA drivers Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 13/15] drivers/net: delete old DEC depca ISA drivers support Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 14/15] drivers/net: delete Digital EtherWorks-3 support Paul Gortmaker
2013-01-22 1:46 ` [PATCH net-next 15/15] drivers/net: delete old x86 variant of the seeq8005 driver Paul Gortmaker
2013-01-22 9:46 ` [PATCH RFC net-next 00/15] drivers/net: obsolete ISA driver round-up David Laight
2013-01-22 19:49 ` 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=1358819182-28032-5-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=davem@davemloft.net \
--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).