isdn: i4l: move active-isdn drivers to staging

The icn, act2000 and pcbit drivers are all for very old hardware, and it is highly unlikely that anyone is actually still using them on modern kernels, if at all. All three drivers apparently are for hardware that predates PCI being the common connector, as they are ISA-only and active PCI ISDN cards were widely available in the 1990s. Looking through the git logs, it I cannot find any indication of a patch to any of these drivers that has been tested on real hardware, only cleanups or global API changes. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Karsten Keil <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
opendata26 · Mar 5, 2016 · a921e9b · a921e9b
1 parent 01ed1e1
commit a921e9b
Show file tree

Hide file tree

Showing 37 changed files with 24 additions and 21 deletions.
diff --git a/Documentation/isdn/00-INDEX b/Documentation/isdn/00-INDEX
@@ -16,8 +16,6 @@ README.FAQ
 	- general info for FAQ.
 README.HiSax
 	- info on the HiSax driver which replaces the old teles.
-README.act2000
-	- info on driver for IBM ACT-2000 card.
 README.audio
 	- info for running audio over ISDN.
 README.avmb1
@@ -34,14 +32,8 @@ README.hfc-pci
 	- info on hfc-pci based cards.
 README.hysdn
         - info on driver for Hypercope active HYSDN cards
-README.icn
-	- info on the ICN-ISDN-card and its driver.
 README.mISDN
 	- info on the Modular ISDN subsystem (mISDN)
-README.pcbit
-	- info on the PCBIT-D ISDN adapter and driver.
-README.sc
-	- info on driver for Spellcaster cards.
 README.syncppp
 	- info on running Sync PPP over ISDN.
 README.x25

diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
@@ -8,9 +8,6 @@ obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
-obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/
-obj-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit/
 obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
-obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
@@ -123,16 +123,6 @@ comment "ISDN4Linux hardware drivers"
 
 source "drivers/isdn/hisax/Kconfig"
 
-
-menu "Active cards"
-
-source "drivers/isdn/icn/Kconfig"
-
-source "drivers/isdn/pcbit/Kconfig"
-
-source "drivers/isdn/act2000/Kconfig"
-
-endmenu
 # end ISDN_I4L
 endif
 
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -104,4 +104,6 @@ source "drivers/staging/wilc1000/Kconfig"
 
 source "drivers/staging/most/Kconfig"
 
+source "drivers/staging/i4l/Kconfig"
+
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -41,3 +41,4 @@ obj-$(CONFIG_FB_TFT)		+= fbtft/
 obj-$(CONFIG_FSL_MC_BUS)	+= fsl-mc/
 obj-$(CONFIG_WILC1000)		+= wilc1000/
 obj-$(CONFIG_MOST)		+= most/
+obj-$(CONFIG_ISDN_I4L)		+= i4l/
diff --git a/Documentation/isdn/README.act2000 → .../staging/i4l/Documentation/README.act2000 b/Documentation/isdn/README.act2000 → .../staging/i4l/Documentation/README.act2000
diff --git a/Documentation/isdn/README.icn → drivers/staging/i4l/Documentation/README.icn b/Documentation/isdn/README.icn → drivers/staging/i4l/Documentation/README.icn
diff --git a/Documentation/isdn/README.pcbit → ...rs/staging/i4l/Documentation/README.pcbit b/Documentation/isdn/README.pcbit → ...rs/staging/i4l/Documentation/README.pcbit
diff --git a/Documentation/isdn/README.sc → drivers/staging/i4l/Documentation/README.sc b/Documentation/isdn/README.sc → drivers/staging/i4l/Documentation/README.sc
diff --git a/drivers/staging/i4l/Kconfig b/drivers/staging/i4l/Kconfig
@@ -0,0 +1,13 @@
+#
+# Old ISDN4Linux config
+#
+menu "Old ISDN4Linux (deprecated)"
+	depends on ISDN_I4L
+
+source "drivers/staging/i4l/icn/Kconfig"
+
+source "drivers/staging/i4l/pcbit/Kconfig"
+
+source "drivers/staging/i4l/act2000/Kconfig"
+
+endmenu
diff --git a/drivers/staging/i4l/Makefile b/drivers/staging/i4l/Makefile
@@ -0,0 +1,5 @@
+# Makefile for the old ISDN I4L subsystem and device drivers.
+
+obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/
+obj-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit/
+obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/
diff --git a/drivers/staging/i4l/TODO b/drivers/staging/i4l/TODO
@@ -0,0 +1,3 @@
+* The icn, pcbit and act2000 drivers are dead, remove them in 2017
+  after another longterm kernel has been released, just in the
+  unlikely case someone still has this hardware.
diff --git a/drivers/isdn/act2000/Kconfig → drivers/staging/i4l/act2000/Kconfig b/drivers/isdn/act2000/Kconfig → drivers/staging/i4l/act2000/Kconfig
diff --git a/drivers/isdn/act2000/Makefile → drivers/staging/i4l/act2000/Makefile b/drivers/isdn/act2000/Makefile → drivers/staging/i4l/act2000/Makefile
diff --git a/drivers/isdn/act2000/act2000.h → drivers/staging/i4l/act2000/act2000.h b/drivers/isdn/act2000/act2000.h → drivers/staging/i4l/act2000/act2000.h
diff --git a/drivers/isdn/act2000/act2000_isa.c → drivers/staging/i4l/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c → drivers/staging/i4l/act2000/act2000_isa.c
diff --git a/drivers/isdn/act2000/act2000_isa.h → drivers/staging/i4l/act2000/act2000_isa.h b/drivers/isdn/act2000/act2000_isa.h → drivers/staging/i4l/act2000/act2000_isa.h
diff --git a/drivers/isdn/act2000/capi.c → drivers/staging/i4l/act2000/capi.c b/drivers/isdn/act2000/capi.c → drivers/staging/i4l/act2000/capi.c
diff --git a/drivers/isdn/act2000/capi.h → drivers/staging/i4l/act2000/capi.h b/drivers/isdn/act2000/capi.h → drivers/staging/i4l/act2000/capi.h
diff --git a/drivers/isdn/act2000/module.c → drivers/staging/i4l/act2000/module.c b/drivers/isdn/act2000/module.c → drivers/staging/i4l/act2000/module.c
diff --git a/drivers/isdn/icn/Kconfig → drivers/staging/i4l/icn/Kconfig b/drivers/isdn/icn/Kconfig → drivers/staging/i4l/icn/Kconfig
diff --git a/drivers/isdn/icn/Makefile → drivers/staging/i4l/icn/Makefile b/drivers/isdn/icn/Makefile → drivers/staging/i4l/icn/Makefile
diff --git a/drivers/isdn/icn/icn.c → drivers/staging/i4l/icn/icn.c b/drivers/isdn/icn/icn.c → drivers/staging/i4l/icn/icn.c
diff --git a/drivers/isdn/icn/icn.h → drivers/staging/i4l/icn/icn.h b/drivers/isdn/icn/icn.h → drivers/staging/i4l/icn/icn.h
diff --git a/drivers/isdn/pcbit/Kconfig → drivers/staging/i4l/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig → drivers/staging/i4l/pcbit/Kconfig
diff --git a/drivers/isdn/pcbit/Makefile → drivers/staging/i4l/pcbit/Makefile b/drivers/isdn/pcbit/Makefile → drivers/staging/i4l/pcbit/Makefile
diff --git a/drivers/isdn/pcbit/callbacks.c → drivers/staging/i4l/pcbit/callbacks.c b/drivers/isdn/pcbit/callbacks.c → drivers/staging/i4l/pcbit/callbacks.c
diff --git a/drivers/isdn/pcbit/callbacks.h → drivers/staging/i4l/pcbit/callbacks.h b/drivers/isdn/pcbit/callbacks.h → drivers/staging/i4l/pcbit/callbacks.h
diff --git a/drivers/isdn/pcbit/capi.c → drivers/staging/i4l/pcbit/capi.c b/drivers/isdn/pcbit/capi.c → drivers/staging/i4l/pcbit/capi.c
diff --git a/drivers/isdn/pcbit/capi.h → drivers/staging/i4l/pcbit/capi.h b/drivers/isdn/pcbit/capi.h → drivers/staging/i4l/pcbit/capi.h
diff --git a/drivers/isdn/pcbit/drv.c → drivers/staging/i4l/pcbit/drv.c b/drivers/isdn/pcbit/drv.c → drivers/staging/i4l/pcbit/drv.c
diff --git a/drivers/isdn/pcbit/edss1.c → drivers/staging/i4l/pcbit/edss1.c b/drivers/isdn/pcbit/edss1.c → drivers/staging/i4l/pcbit/edss1.c
diff --git a/drivers/isdn/pcbit/edss1.h → drivers/staging/i4l/pcbit/edss1.h b/drivers/isdn/pcbit/edss1.h → drivers/staging/i4l/pcbit/edss1.h
diff --git a/drivers/isdn/pcbit/layer2.c → drivers/staging/i4l/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c → drivers/staging/i4l/pcbit/layer2.c
diff --git a/drivers/isdn/pcbit/layer2.h → drivers/staging/i4l/pcbit/layer2.h b/drivers/isdn/pcbit/layer2.h → drivers/staging/i4l/pcbit/layer2.h
diff --git a/drivers/isdn/pcbit/module.c → drivers/staging/i4l/pcbit/module.c b/drivers/isdn/pcbit/module.c → drivers/staging/i4l/pcbit/module.c
diff --git a/drivers/isdn/pcbit/pcbit.h → drivers/staging/i4l/pcbit/pcbit.h b/drivers/isdn/pcbit/pcbit.h → drivers/staging/i4l/pcbit/pcbit.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,4 +104,6 @@ source "drivers/staging/wilc1000/Kconfig"

		source "drivers/staging/most/Kconfig"

		source "drivers/staging/i4l/Kconfig"

		endif # STAGING