media: zr364xx: deprecate this driver

Deprecate the zr364xx driver. This driver does not use the vb2 framework
for video streaming, instead it uses the old videobuf framework.

We want to get rid of these old drivers, so deprecated it for future
removal.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 47b9118ee99240802d5d10c6caa5ba9666f4cf7c..e26da9b8e277b416036988eae60b7e6ab036973e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21218,7 +21218,7 @@ S:      Maintained
 W:     http://royale.zerezo.com/zr364xx/
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/zr364xx*
-F:     drivers/media/usb/zr364xx/
+F:     drivers/staging/media/deprecated/zr364xx/
 
 USER-MODE LINUX (UML)
 M:     Richard Weinberger <richard@nod.at>

diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index afbb8dd28b5b2c048d2fff29afd6b7d7b4c8d052..3d0138f8573ca23d7e2b4dd039351f105341c404 100644 (file)
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -18,7 +18,6 @@ source "drivers/media/usb/pwc/Kconfig"
 source "drivers/media/usb/s2255/Kconfig"
 source "drivers/media/usb/usbtv/Kconfig"
 source "drivers/media/usb/uvc/Kconfig"
-source "drivers/media/usb/zr364xx/Kconfig"
 
 endif
 

diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index fa8e16ff9b0304b3fd71ec6823c7f67fbe9a8842..7fccc6604b1f49cbe1ee22bb5e14689877fbda03 100644 (file)
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -12,7 +12,6 @@ obj-y += s2255/
 obj-y += siano/
 obj-y += ttusb-budget/
 obj-y += ttusb-dec/
-obj-y += zr364xx/
 
 # Please keep it alphabetically sorted by Kconfig name
 # (e. g. LC_ALL=C sort Makefile)

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index ed3e484603d700c5fdb0e9d50ee6c613c53a4757..84f627ccf63ec4672dca4cecfc1911b56f5129a5 100644 (file)
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -58,6 +58,7 @@ if STAGING_MEDIA_DEPRECATED
 source "drivers/staging/media/deprecated/cpia2/Kconfig"
 source "drivers/staging/media/deprecated/meye/Kconfig"
 source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
+source "drivers/staging/media/deprecated/zr364xx/Kconfig"
 endif
 
 endif

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 822c70ab4c0bdf4fddcf93f9a12b4ec8a427cfc6..ed7e5a61fc00b6e8c5dca04345fba656218ba671 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -12,4 +12,5 @@ obj-$(CONFIG_VIDEO_SUNXI)     += sunxi/
 obj-$(CONFIG_VIDEO_TEGRA)      += tegra-video/
 obj-$(CONFIG_VIDEO_HANTRO)     += hantro/
 obj-$(CONFIG_VIDEO_IPU3_IMGU)  += ipu3/
+obj-$(CONFIG_USB_ZR364XX)      += deprecated/zr364xx/
 obj-$(CONFIG_DVB_AV7110)       += av7110/

diff --git a/drivers/media/usb/zr364xx/Kconfig b/drivers/staging/media/deprecated/zr364xx/Kconfig
similarity index 65%
rename from drivers/media/usb/zr364xx/Kconfig
rename to drivers/staging/media/deprecated/zr364xx/Kconfig
index a9fb02566c4b63d024485c2536350911bc0fc1e7..ea29c9d8dca24628be1c72de36227bc07779be23 100644 (file)
--- a/drivers/media/usb/zr364xx/Kconfig
+++ b/drivers/staging/media/deprecated/zr364xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config USB_ZR364XX
-       tristate "USB ZR364XX Camera support"
-       depends on VIDEO_DEV
+       tristate "USB ZR364XX Camera support (DEPRECATED)"
+       depends on USB && VIDEO_DEV
        select VIDEOBUF_GEN
        select VIDEOBUF_VMALLOC
        help
@@ -10,6 +10,9 @@ config USB_ZR364XX
          See <file:Documentation/admin-guide/media/zr364xx.rst> for more info
          and list of supported cameras.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          To compile this driver as a module, choose M here: the
          module will be called zr364xx.
 

diff --git a/drivers/media/usb/zr364xx/Makefile b/drivers/staging/media/deprecated/zr364xx/Makefile
similarity index 100%
rename from drivers/media/usb/zr364xx/Makefile
rename to drivers/staging/media/deprecated/zr364xx/Makefile

diff --git a/drivers/staging/media/deprecated/zr364xx/TODO b/drivers/staging/media/deprecated/zr364xx/TODO
new file mode 100644 (file)
index 0000000..ecb30a4
--- /dev/null
+++ b/drivers/staging/media/deprecated/zr364xx/TODO
@@ -0,0 +1,7 @@
+This is one of the few drivers still not using the vb2
+framework, so this driver is now deprecated with the intent of
+removing it altogether by the beginning of 2023.
+
+In order to keep this driver it has to be converted to vb2.
+If someone is interested in doing this work, then contact the
+linux-media mailinglist (https://linuxtv.org/lists.php).

diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/staging/media/deprecated/zr364xx/zr364xx.c
similarity index 100%
rename from drivers/media/usb/zr364xx/zr364xx.c
rename to drivers/staging/media/deprecated/zr364xx/zr364xx.c