media: tm6000: deprecate this driver

Deprecate the tm6000 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 e26da9b..2a61d11 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20469,7 +20469,7 @@ S:      Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/tm6000*
-F:     drivers/media/usb/tm6000/
+F:     drivers/staging/media/deprecated/tm6000/
 
 TMIO/SDHI MMC DRIVER
 M:     Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 3d0138f..813171d 100644 (file)
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -36,7 +36,6 @@ if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)
 
 source "drivers/media/usb/au0828/Kconfig"
 source "drivers/media/usb/cx231xx/Kconfig"
-source "drivers/media/usb/tm6000/Kconfig"
 
 endif
 

diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 7fccc66..6d171be 100644 (file)
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -29,5 +29,4 @@ obj-$(CONFIG_VIDEO_GO7007) += go7007/
 obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_STK1160) += stk1160/
-obj-$(CONFIG_VIDEO_TM6000) += tm6000/
 obj-$(CONFIG_VIDEO_USBTV) += usbtv/

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 84f627c..0a0e052 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/tm6000/Kconfig"
 source "drivers/staging/media/deprecated/zr364xx/Kconfig"
 endif
 

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

diff --git a/drivers/media/usb/tm6000/Kconfig b/drivers/staging/media/deprecated/tm6000/Kconfig
similarity index 84%
rename from drivers/media/usb/tm6000/Kconfig
rename to drivers/staging/media/deprecated/tm6000/Kconfig
index 56e977d..73d72e4 100644 (file)
--- a/drivers/media/usb/tm6000/Kconfig
+++ b/drivers/staging/media/deprecated/tm6000/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_TM6000
-       tristate "TV Master TM5600/6000/6010 driver"
+       tristate "TV Master TM5600/6000/6010 driver (DEPRECATED)"
        depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB
        select VIDEO_TUNER
        select MEDIA_TUNER_XC2028
@@ -13,6 +13,9 @@ config VIDEO_TM6000
          only compressed MPEG data over the usb bus, so you need
          an external software decoder to watch TV on your computer.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          Say Y if you own such a device and want to use it.
 
 config VIDEO_TM6000_ALSA

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

diff --git a/drivers/staging/media/deprecated/tm6000/TODO b/drivers/staging/media/deprecated/tm6000/TODO
new file mode 100644 (file)
index 0000000..ecb30a4
--- /dev/null
+++ b/drivers/staging/media/deprecated/tm6000/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/tm6000/tm6000-alsa.c b/drivers/staging/media/deprecated/tm6000/tm6000-alsa.c
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-alsa.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-alsa.c

diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/staging/media/deprecated/tm6000/tm6000-cards.c
similarity index 99%
rename from drivers/media/usb/tm6000/tm6000-cards.c
rename to drivers/staging/media/deprecated/tm6000/tm6000-cards.c
index b7842cd..98f4a63 100644 (file)
--- a/drivers/media/usb/tm6000/tm6000-cards.c
+++ b/drivers/staging/media/deprecated/tm6000/tm6000-cards.c
@@ -1297,7 +1297,7 @@ static int tm6000_usb_probe(struct usb_interface *interface,
                le16_to_cpu(dev->udev->descriptor.idProduct),
                interface->altsetting->desc.bInterfaceNumber);
 
-/* check if the device has the iso in endpoint at the correct place */
+/* check if the the device has the iso in endpoint at the correct place */
        if (!dev->isoc_in.endp) {
                printk(KERN_ERR "tm6000: probing error: no IN ISOC endpoint!\n");
                rc = -ENODEV;

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

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

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

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

diff --git a/drivers/media/usb/tm6000/tm6000-regs.h b/drivers/staging/media/deprecated/tm6000/tm6000-regs.h
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-regs.h
rename to drivers/staging/media/deprecated/tm6000/tm6000-regs.h

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

diff --git a/drivers/media/usb/tm6000/tm6000-usb-isoc.h b/drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h
similarity index 100%
rename from drivers/media/usb/tm6000/tm6000-usb-isoc.h
rename to drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h

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

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