diff mbox series

[3/9] meye: deprecate this driver

Message ID 20220811091749.3956641-4-hverkuil-cisco@xs4all.nl
State Accepted
Commit 9a97cc155cc75571db72adf6992d11aa1de0c83a
Headers show
Series Deprecate old non-vb2 drivers | expand

Commit Message

Hans Verkuil Aug. 11, 2022, 9:17 a.m. UTC 
Deprecate the meye driver. This driver does not use the vb2 framework
for video streaming, instead it implements its own version.

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

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
 drivers/media/pci/Kconfig                                   | 1 -
 drivers/media/pci/Makefile                                  | 1 -
 drivers/staging/media/Kconfig                               | 1 +
 drivers/staging/media/Makefile                              | 1 +
 .../{media/pci => staging/media/deprecated}/meye/Kconfig    | 5 ++++-
 .../{media/pci => staging/media/deprecated}/meye/Makefile   | 0
 drivers/staging/media/deprecated/meye/TODO                  | 6 ++++++
 drivers/{media/pci => staging/media/deprecated}/meye/meye.c | 0
 drivers/{media/pci => staging/media/deprecated}/meye/meye.h | 0
 9 files changed, 12 insertions(+), 3 deletions(-)
 rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%)
 rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%)
 create mode 100644 drivers/staging/media/deprecated/meye/TODO
 rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%)
 rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%)
diff mbox series

Patch

diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 1224d908713a..84c927516c11 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -13,7 +13,6 @@  if MEDIA_PCI_SUPPORT
 if MEDIA_CAMERA_SUPPORT
 	comment "Media capture support"
 
-source "drivers/media/pci/meye/Kconfig"
 source "drivers/media/pci/solo6x10/Kconfig"
 source "drivers/media/pci/sta2x11/Kconfig"
 source "drivers/media/pci/tw5864/Kconfig"
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index 551169a3e434..6ad7c4dff021 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -32,7 +32,6 @@  obj-$(CONFIG_VIDEO_CX25821) += cx25821/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_DT3155) += dt3155/
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
-obj-$(CONFIG_VIDEO_MEYE) += meye/
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
 obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 360220ad9ffd..180f450f9e27 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -58,6 +58,7 @@  menuconfig STAGING_MEDIA_DEPRECATED
 
 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"
 endif
 
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 12e0cbbeaad1..f10f6613a443 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -4,6 +4,7 @@  obj-$(CONFIG_VIDEO_CPIA2)	+= deprecated/cpia2/
 obj-$(CONFIG_VIDEO_IMX_MEDIA)	+= imx/
 obj-$(CONFIG_VIDEO_MAX96712)	+= max96712/
 obj-$(CONFIG_VIDEO_MESON_VDEC)	+= meson/vdec/
+obj-$(CONFIG_VIDEO_MEYE)	+= deprecated/meye/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC)	+= rkvdec/
 obj-$(CONFIG_VIDEO_STKWEBCAM)	+= deprecated/stkwebcam/
diff --git a/drivers/media/pci/meye/Kconfig b/drivers/staging/media/deprecated/meye/Kconfig
similarity index 73%
rename from drivers/media/pci/meye/Kconfig
rename to drivers/staging/media/deprecated/meye/Kconfig
index 3e69b66f1a5b..f135f8568c85 100644
--- a/drivers/media/pci/meye/Kconfig
+++ b/drivers/staging/media/deprecated/meye/Kconfig
@@ -1,6 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_MEYE
-	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
+	tristate "Sony Vaio Picturebook Motion Eye Video For Linux (DEPRECATED)"
 	depends on PCI && VIDEO_DEV
 	depends on SONY_LAPTOP
 	depends on X86 || COMPILE_TEST
@@ -12,5 +12,8 @@  config VIDEO_MEYE
 	  If you say Y or M here, you need to say Y or M to "Sony Laptop
 	  Extras" in the misc device section.
 
+	  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 meye.
diff --git a/drivers/media/pci/meye/Makefile b/drivers/staging/media/deprecated/meye/Makefile
similarity index 100%
rename from drivers/media/pci/meye/Makefile
rename to drivers/staging/media/deprecated/meye/Makefile
diff --git a/drivers/staging/media/deprecated/meye/TODO b/drivers/staging/media/deprecated/meye/TODO
new file mode 100644
index 000000000000..6d1d1433d5a0
--- /dev/null
+++ b/drivers/staging/media/deprecated/meye/TODO
@@ -0,0 +1,6 @@ 
+The meye driver does not use the vb2 framework for streaming
+video, instead it implements this in the driver.
+
+To prevent removal of this driver early 2023 it has to be
+converted to use vb2. Contact the linux-media@vger.kernel.org
+mailing list if you want to do this.
diff --git a/drivers/media/pci/meye/meye.c b/drivers/staging/media/deprecated/meye/meye.c
similarity index 100%
rename from drivers/media/pci/meye/meye.c
rename to drivers/staging/media/deprecated/meye/meye.c
diff --git a/drivers/media/pci/meye/meye.h b/drivers/staging/media/deprecated/meye/meye.h
similarity index 100%
rename from drivers/media/pci/meye/meye.h
rename to drivers/staging/media/deprecated/meye/meye.h