V4L/DVB: Deprecate stradis driver

The driver author seems to not worked on this driver since its conversion
from 2.2 to 2.4. Nobody is known to have a stradis hardware for testing. As
it still uses V4L1 API, BKL and probably some other old stuff, someone would
need to work on it to preserve the driver. Instead of investing time and
efforts to keep porting it to work with new API's, it seems better to just
drop the driver.

So, let's move it to drivers/staging and label it to die at 2.6.38, if nobody
cares enough to port parallel port support to gspca or to create a new driver
that uses the same gspca-cpia sub-driver.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 448722555648310f917e635a92feef34bec6d265..d87ee1760e3aaf83294d0dd316904189f57e607e 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -118,8 +118,8 @@ Who:        Mauro Carvalho Chehab <mchehab@infradead.org>
 
 What:  Video4Linux obsolete drivers using V4L1 API
 When:  kernel 2.6.38
-Files: drivers/staging/cpia/*
-Check: drivers/staging/cpia/cpia.c
+Files: drivers/staging/cpia/* drivers/staging/stradis/*
+Check: drivers/staging/cpia/cpia.c drivers/staging/stradis/stradis.c
 Why:   There are some drivers still using V4L1 API, despite all efforts we've done
        to migrate. Those drivers are for obsolete hardware that the old maintainer
        didn't care (or not have the hardware anymore), and that no other developer

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4f21ef877f375aa0747107442bfc82525215e911..75404fc8e5c256393bc7574070a6add5208a5938 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -609,14 +609,6 @@ config VIDEO_VINO
          Say Y here to build in support for the Vino video input system found
          on SGI Indy machines.
 
-config VIDEO_STRADIS
-       tristate "Stradis 4:2:2 MPEG-2 video driver  (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && VIRT_TO_BUS
-       help
-         Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
-         driver for PCI.  There is a product page at
-         <http://www.stradis.com/>.
-
 source "drivers/media/video/zoran/Kconfig"
 
 config VIDEO_MEYE

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index b947160a8cb0313dc2d497078ab24c0a492974b8..118196c06fcd592c2cfbcc8f3a76de86b0f85b2e 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -91,7 +91,6 @@ obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o
 obj-$(CONFIG_VIDEO_W9966) += w9966.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o
-obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 303c52cfe915ad1960915a72375478f7cf312f6d..078525ca19d00d86673c420b92a03c7bbeedc043 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -53,6 +53,8 @@ source "drivers/staging/tm6000/Kconfig"
 
 source "drivers/staging/cpia/Kconfig"
 
+source "drivers/staging/stradis/Kconfig"
+
 source "drivers/staging/usbip/Kconfig"
 
 source "drivers/staging/winbond/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ddcac245c99a9d8c96f4ba502955e146e3c50b29..057adca4d04de47f934ec91365a3fd9c5f9cecd6 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_VIDEO_GO7007)      += go7007/
 obj-$(CONFIG_VIDEO_CX25821)    += cx25821/
 obj-$(CONFIG_VIDEO_TM6000)     += tm6000/
 obj-$(CONFIG_VIDEO_CPIA)       += cpia/
+obj-$(CONFIG_VIDEO_STRADIS)    += stradis/
 obj-$(CONFIG_LIRC_STAGING)     += lirc/
 obj-$(CONFIG_USB_IP_COMMON)    += usbip/
 obj-$(CONFIG_W35UND)           += winbond/

diff --git a/drivers/staging/stradis/Kconfig b/drivers/staging/stradis/Kconfig
new file mode 100644 (file)
index 0000000..92e8911
--- /dev/null
+++ b/drivers/staging/stradis/Kconfig
@@ -0,0 +1,7 @@
+config VIDEO_STRADIS
+        tristate "Stradis 4:2:2 MPEG-2 video driver (DEPRECATED)"
+        depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && VIRT_TO_BUS
+        help
+          Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
+          driver for PCI.  There is a product page at
+          <http://www.stradis.com/>.

diff --git a/drivers/staging/stradis/Makefile b/drivers/staging/stradis/Makefile
new file mode 100644 (file)
index 0000000..0f1feab
--- /dev/null
+++ b/drivers/staging/stradis/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
+
+EXTRA_CFLAGS += -Idrivers/media/video

diff --git a/drivers/staging/stradis/TODO b/drivers/staging/stradis/TODO
new file mode 100644 (file)
index 0000000..f48150f
--- /dev/null
+++ b/drivers/staging/stradis/TODO
@@ -0,0 +1,6 @@
+This is an obsolete driver for ancient stradis hardware.
+We couldn't find anyone with this hardware in order to port it to use V4L2.
+
+If nobody take care on it, the driver will be removed for 2.6.38.
+
+Please send patches to linux-media@vger.kernel.org

diff --git a/drivers/media/video/stradis.c b/drivers/staging/stradis/stradis.c
similarity index 100%
rename from drivers/media/video/stradis.c
rename to drivers/staging/stradis/stradis.c