Remove amdtp, cmp drivers.

Remove the Audio and Music Data Transmission Protocol driver and the
Connection Management Procedures driver.  These are incomplete, have never
worked, and are better implemented in userland via raw1394 (see
http://freebob.sourceforge.net/ for example.)

Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Cc: Adrian Bunk <bunk@stusta.de>

5 files changed, 2 insertions, 46 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b67189a8d8d4..daaf03eaea6e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -40,17 +40,6 @@ Who:	Paul E. McKenney <paulmck@us.ibm.com>
 
 ---------------------------
 
-What:   IEEE1394 Audio and Music Data Transmission Protocol driver,
-        Connection Management Procedures driver
-When:   November 2005
-Files:  drivers/ieee1394/{amdtp,cmp}*
-Why:    These are incomplete, have never worked, and are better implemented
-        in userland via raw1394 (see http://freebob.sourceforge.net/ for
-        example.)
-Who:    Jody McIntyre <scjody@steamballoon.com>
-
----------------------------
-
 What:   raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
 When:   November 2005
 Why:    Deprecated in favour of the new ioctl-based rawiso interface, which is
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 25103a0ef9b3..39142e2f804b 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -169,27 +169,4 @@ config IEEE1394_RAWIO
           To compile this driver as a module, say M here: the
           module will be called raw1394.
 
-config IEEE1394_CMP
-        tristate "IEC61883-1 Plug support"
-        depends on IEEE1394
-        help
-          This option enables the Connection Management Procedures
-          (IEC61883-1) driver, which implements input and output plugs.
-
-          To compile this driver as a module, say M here: the
-          module will be called cmp.
-
-config IEEE1394_AMDTP
-        tristate "IEC61883-6 (Audio transmission) support"
-        depends on IEEE1394 && IEEE1394_OHCI1394 && IEEE1394_CMP
-        help
-          This option enables the Audio & Music Data Transmission Protocol
-          (IEC61883-6) driver, which implements audio transmission over
-          IEEE1394.
-
-          The userspace interface is documented in amdtp.h.
-
-          To compile this driver as a module, say M here: the
-          module will be called amdtp.
-
 endmenu
diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile
index e8b4d48d376e..6f53611fe255 100644
--- a/drivers/ieee1394/Makefile
+++ b/drivers/ieee1394/Makefile
@@ -14,8 +14,6 @@ obj-$(CONFIG_IEEE1394_RAWIO) += raw1394.o
 obj-$(CONFIG_IEEE1394_SBP2) += sbp2.o
 obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o
 obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o
-obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o
-obj-$(CONFIG_IEEE1394_CMP) += cmp.o
 
 quiet_cmd_oui2c = OUI2C   $@
       cmd_oui2c = $(CONFIG_SHELL) $(srctree)/$(src)/oui2c.sh < $< > $@
diff --git a/drivers/ieee1394/ieee1394-ioctl.h b/drivers/ieee1394/ieee1394-ioctl.h
index f92b566363d5..156703986348 100644
--- a/drivers/ieee1394/ieee1394-ioctl.h
+++ b/drivers/ieee1394/ieee1394-ioctl.h
@@ -7,14 +7,6 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
-
-/* AMDTP Gets 6 */
-#define AMDTP_IOC_CHANNEL       _IOW('#', 0x00, struct amdtp_ioctl)
-#define AMDTP_IOC_PLUG          _IOW('#', 0x01, struct amdtp_ioctl)
-#define AMDTP_IOC_PING          _IOW('#', 0x02, struct amdtp_ioctl)
-#define AMDTP_IOC_ZAP           _IO ('#', 0x03)
-
-
 /* DV1394 Gets 10 */
 
 /* Get the driver ready to transmit video.  pass a struct dv1394_init* as
diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h
index cc66c1cae250..7df0962144e3 100644
--- a/drivers/ieee1394/ohci1394.h
+++ b/drivers/ieee1394/ohci1394.h
@@ -219,8 +219,8 @@ struct ti_ohci {
 
         int self_id_errors;
 
-        /* Tasklets for iso receive and transmit, used by video1394,
-         * amdtp and dv1394 */
+        /* Tasklets for iso receive and transmit, used by video1394
+         * and dv1394 */
 
         struct list_head iso_tasklet_list;
         spinlock_t iso_tasklet_list_lock;