ieee1394: dv1394: schedule for feature removal

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

3 files changed, 19 insertions, 9 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 3fef3444c761..c8c6daeefed0 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -39,6 +39,17 @@ Who:	Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
 
 ---------------------------
 
+What:   dv1394 driver (CONFIG_IEEE1394_DV1394)
+When:   June 2007
+Why:    Replaced by raw1394 + userspace libraries, notably libiec61883.  This
+        shift of application support has been indicated on www.linux1394.org
+        and developers' mailinglists for quite some time.  Major applications
+        have been converted, with the exception of ffmpeg and hence xine.
+        Piped output of dvgrab2 is a partial equivalent to dv1394.
+Who:    Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>
+
+---------------------------
+
 What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:   December 2006
 Why:    V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 672b92ef9f21..680da9e195dc 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -161,17 +161,12 @@ config IEEE1394_ETH1394
           MCAP, therefore multicast support is significantly limited.
 
 config IEEE1394_DV1394
-        tristate "OHCI-DV I/O support"
+        tristate "OHCI-DV I/O support (deprecated)"
         depends on IEEE1394 && IEEE1394_OHCI1394
         help
-          This driver allows you to transmit and receive DV (digital video)
-          streams on an OHCI-1394 card using a simple frame-oriented
-          interface.
-
-          The user-space API for dv1394 is documented in dv1394.h.
-
-          To compile this driver as a module, say M here: the
-          module will be called dv1394.
+          The dv1394 driver will be removed from Linux in a future release.
+          Its functionality is now provided by raw1394 together with libraries
+          such as libiec61883.
 
 config IEEE1394_RAWIO
         tristate "Raw IEEE1394 I/O support"
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index d0e11c176c3b..3bd78efd1852 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2579,6 +2579,10 @@ static int __init dv1394_init_module(void)
 {
         int ret;
 
+        printk(KERN_WARNING
+               "WARNING: The dv1394 driver is unsupported and will be removed "
+               "from Linux soon. Use raw1394 instead.\n");
+
         cdev_init(&dv1394_cdev, &dv1394_fops);
         dv1394_cdev.owner = THIS_MODULE;
         kobject_set_name(&dv1394_cdev.kobj, "dv1394");