[media] bw/c-qcam, w9966, pms: remove deprecated staging drivers

These drivers haven't been tested in a long, long time. The hardware is
ancient and hopelessly obsolete. These drivers also need to be converted
to newer media frameworks but due to the lack of hardware that's going
to be impossible. In addition, cheaper and vastly better hardware is
available today.

These drivers are already deprecated, so now remove them altogether.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index f3ae573..3db56b8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6158,14 +6158,6 @@ F:       include/uapi/linux/meye.h
 F:     include/uapi/linux/ivtv*
 F:     include/uapi/linux/uvcvideo.h
 
-MEDIAVISION PRO MOVIE STUDIO DRIVER
-M:     Hans Verkuil <hverkuil@xs4all.nl>
-L:     linux-media@vger.kernel.org
-T:     git git://linuxtv.org/media_tree.git
-W:     http://linuxtv.org
-S:     Odd Fixes
-F:     drivers/media/parport/pms*
-
 MEGARAID SCSI/SAS DRIVERS
 M:     Kashyap Desai <kashyap.desai@avagotech.com>
 M:     Sumit Saxena <sumit.saxena@avagotech.com>
@@ -7855,14 +7847,6 @@ T:       git git://github.com/KrasnikovEugene/wcn36xx.git
 S:     Supported
 F:     drivers/net/wireless/ath/wcn36xx/
 
-QUICKCAM PARALLEL PORT WEBCAMS
-M:     Hans Verkuil <hverkuil@xs4all.nl>
-L:     linux-media@vger.kernel.org
-T:     git git://linuxtv.org/media_tree.git
-W:     http://linuxtv.org
-S:     Odd Fixes
-F:     drivers/media/parport/*-qcam*
-
 RADOS BLOCK DEVICE (RBD)
 M:     Yehuda Sadeh <yehuda@inktank.com>
 M:     Sage Weil <sage@inktank.com>

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index e633204..96498b7 100644 (file)
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -33,8 +33,6 @@ source "drivers/staging/media/mn88473/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"
 
-source "drivers/staging/media/parport/Kconfig"
-
 # Keep LIRC at the end, as it has sub-menus
 source "drivers/staging/media/lirc/Kconfig"
 

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 7edb567..a9006bc 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_VIDEO_DM365_VPFE)  += davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)      += omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/
-obj-y                          += parport/

diff --git a/drivers/staging/media/parport/Kconfig b/drivers/staging/media/parport/Kconfig
deleted file mode 100644 (file)
index 15974ef..0000000
--- a/drivers/staging/media/parport/Kconfig
+++ /dev/null
@@ -1,69 +0,0 @@
-menuconfig MEDIA_PARPORT_SUPPORT
-       bool "ISA and parallel port devices"
-       depends on (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT
-       help
-         Enables drivers for ISA and parallel port bus. If you
-         need media drivers using those legacy buses, say Y.
-
-if MEDIA_PARPORT_SUPPORT
-config VIDEO_BWQCAM
-       tristate "Quickcam BW Video For Linux (Deprecated)"
-       depends on PARPORT && VIDEO_V4L2
-       select VIDEOBUF2_VMALLOC
-       help
-         Say Y have if you the black and white version of the QuickCam
-         camera. See the next option for the color version.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-
-         To compile this driver as a module, choose M here: the
-         module will be called bw-qcam.
-
-config VIDEO_CQCAM
-       tristate "QuickCam Colour Video For Linux (Deprecated)"
-       depends on PARPORT && VIDEO_V4L2
-       help
-         This is the video4linux driver for the colour version of the
-         Connectix QuickCam.  If you have one of these cameras, say Y here,
-         otherwise say N.  This driver does not work with the original
-         monochrome QuickCam, QuickCam VC or QuickClip.  It is also available
-         as a module (c-qcam).
-         Read <file:Documentation/video4linux/CQcam.txt> for more information.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-
-config VIDEO_PMS
-       tristate "Mediavision Pro Movie Studio Video For Linux (Deprecated)"
-       depends on ISA && VIDEO_V4L2
-       help
-         Say Y if you have the ISA Mediavision Pro Movie Studio
-         capture card.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pms.
-
-config VIDEO_W9966
-       tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux (Deprecated)"
-       depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
-       help
-         Video4linux driver for Winbond's w9966 based Webcams.
-         Currently tested with the LifeView FlyCam Supra.
-         If you have one of these cameras, say Y here
-         otherwise say N.
-         This driver is also available as a module (w9966).
-
-         Check out <file:Documentation/video4linux/w9966.txt> for more
-         information.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-endif

diff --git a/drivers/staging/media/parport/Makefile b/drivers/staging/media/parport/Makefile
deleted file mode 100644 (file)
index 4eea06d..0000000
--- a/drivers/staging/media/parport/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
-obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o
-obj-$(CONFIG_VIDEO_W9966) += w9966.o
-obj-$(CONFIG_VIDEO_PMS) += pms.o

diff --cc drivers/staging/media/parport/bw-qcam.c
Simple merge

diff --cc drivers/staging/media/parport/c-qcam.c
Simple merge

diff --cc drivers/staging/media/parport/pms.c
Simple merge

diff --cc drivers/staging/media/parport/w9966.c
Simple merge