drop media-i2c-ths8200-needs-v4l2_async.patch from 5.4 and 5.10

diff --git a/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch b/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch
deleted file mode 100644 (file)
index 5256b99..0000000
--- a/queue-5.10/media-i2c-ths8200-needs-v4l2_async.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a61f99205e6074bdbbdb6e77d31b25836666ab75 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 5 Sep 2021 01:28:08 +0200
-Subject: media: i2c: ths8200 needs V4L2_ASYNC
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-[ Upstream commit e4625044d656f3c33ece0cc9da22577bc10ca5d3 ]
-
-Fix the build errors reported by the kernel test robot by
-selecting V4L2_ASYNC:
-
-mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_remove':
-ths8200.c:(.text+0x1ec): undefined reference to `v4l2_async_unregister_subdev'
-mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_probe':
-ths8200.c:(.text+0x404): undefined reference to `v4l2_async_register_subdev'
-
-Fixes: ed29f89497006 ("media: i2c: ths8200: support asynchronous probing")
-Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
-Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/media/i2c/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 878f66ef2719f..5f5a3915ac778 100644
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -595,6 +595,7 @@ config VIDEO_AK881X
- config VIDEO_THS8200
-       tristate "Texas Instruments THS8200 video encoder"
-       depends on VIDEO_V4L2 && I2C
-+      select V4L2_ASYNC
-       help
-         Support for the Texas Instruments THS8200 video encoder.
- 
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 59cc206180bac1b1718f86c74cc030525b0d7f9b..c166c66fc518d2a8bb4777dc92c42967d98191f4 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -289,7 +289,6 @@ media-dvb-usb-fix-ununit-value-in-az6027_rc_query.patch
 media-v4l2-ioctl-s_ctrl-output-the-right-value.patch
 media-tda1997x-handle-short-reads-of-hdmi-info-frame.patch
 media-mtk-vpu-fix-a-resource-leak-in-the-error-handl.patch
-media-i2c-ths8200-needs-v4l2_async.patch
 media-radio-wl1273-avoid-card-name-truncation.patch
 media-si470x-avoid-card-name-truncation.patch
 media-tm6000-avoid-card-name-truncation.patch

diff --git a/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch b/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch
deleted file mode 100644 (file)
index 89f4cd2..0000000
--- a/queue-5.4/media-i2c-ths8200-needs-v4l2_async.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3189af0b190d5792ffc42fcccb4d1108eb199ceb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 5 Sep 2021 01:28:08 +0200
-Subject: media: i2c: ths8200 needs V4L2_ASYNC
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-[ Upstream commit e4625044d656f3c33ece0cc9da22577bc10ca5d3 ]
-
-Fix the build errors reported by the kernel test robot by
-selecting V4L2_ASYNC:
-
-mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_remove':
-ths8200.c:(.text+0x1ec): undefined reference to `v4l2_async_unregister_subdev'
-mips-linux-ld: drivers/media/i2c/ths8200.o: in function `ths8200_probe':
-ths8200.c:(.text+0x404): undefined reference to `v4l2_async_register_subdev'
-
-Fixes: ed29f89497006 ("media: i2c: ths8200: support asynchronous probing")
-Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Reviewed-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
-Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/media/i2c/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index fcffcc31d168a..aa2c3776db840 100644
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -552,6 +552,7 @@ config VIDEO_AK881X
- config VIDEO_THS8200
-       tristate "Texas Instruments THS8200 video encoder"
-       depends on VIDEO_V4L2 && I2C
-+      select V4L2_ASYNC
-       help
-         Support for the Texas Instruments THS8200 video encoder.
- 
--- 
-2.33.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 0d647cf04bbe46f44166e4bc8f4ecc6fe1fb4db6..307a7f77db10e04fcf8f650deb1119ee835fc022 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -195,7 +195,6 @@ media-cxd2880-spi-fix-a-null-pointer-dereference-on-.patch
 media-dvb-usb-fix-ununit-value-in-az6027_rc_query.patch
 media-tda1997x-handle-short-reads-of-hdmi-info-frame.patch
 media-mtk-vpu-fix-a-resource-leak-in-the-error-handl.patch
-media-i2c-ths8200-needs-v4l2_async.patch
 media-radio-wl1273-avoid-card-name-truncation.patch
 media-si470x-avoid-card-name-truncation.patch
 media-tm6000-avoid-card-name-truncation.patch