This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: remove the old videobuf framework
Author: Hans Verkuil <hverkuil-ci...@xs4all.nl>
Date: Sun Aug 13 10:22:54 2023 +0200
The last driver that still used this old framework has been converted
to the videobuf2 framework. So it is now time to delete the old videobuf
code.
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
Documentation/driver-api/media/v4l2-core.rst | 1 -
Documentation/driver-api/media/v4l2-dev.rst | 8 -
Documentation/driver-api/media/v4l2-videobuf.rst | 403 -------
.../zh_CN/video4linux/v4l2-framework.txt | 12 -
drivers/media/v4l2-core/Kconfig | 16 -
drivers/media/v4l2-core/Makefile | 5 -
drivers/media/v4l2-core/videobuf-core.c | 1198 --------------------
drivers/media/v4l2-core/videobuf-dma-contig.c | 402 -------
drivers/media/v4l2-core/videobuf-dma-sg.c | 681 -----------
drivers/media/v4l2-core/videobuf-vmalloc.c | 326 ------
include/media/videobuf-core.h | 233 ----
include/media/videobuf-dma-contig.h | 30 -
include/media/videobuf-dma-sg.h | 102 --
include/media/videobuf-vmalloc.h | 43 -
14 files changed, 3460 deletions(-)
---
diff --git a/Documentation/driver-api/media/v4l2-core.rst
b/Documentation/driver-api/media/v4l2-core.rst
index 239045ecc8f4..58cba831ade5 100644
--- a/Documentation/driver-api/media/v4l2-core.rst
+++ b/Documentation/driver-api/media/v4l2-core.rst
@@ -13,7 +13,6 @@ Video4Linux devices
v4l2-subdev
v4l2-event
v4l2-controls
- v4l2-videobuf
v4l2-videobuf2
v4l2-dv-timings
v4l2-flash-led-class
diff --git a/Documentation/driver-api/media/v4l2-dev.rst
b/Documentation/driver-api/media/v4l2-dev.rst
index 99e3b5fa7444..d5cb19b21a9f 100644
--- a/Documentation/driver-api/media/v4l2-dev.rst
+++ b/Documentation/driver-api/media/v4l2-dev.rst
@@ -157,14 +157,6 @@ changing the e.g. exposure of the webcam.
Of course, you can always do all the locking yourself by leaving both lock
pointers at ``NULL``.
-If you use the old :ref:`videobuf framework <vb_framework>` then you must
-pass the :c:type:`video_device`->lock to the videobuf queue initialize
-function: if videobuf has to wait for a frame to arrive, then it will
-temporarily unlock the lock and relock it afterwards. If your driver also
-waits in the code, then you should do the same to allow other
-processes to access the device node while the first process is waiting for
-something.
-
In the case of :ref:`videobuf2 <vb2_framework>` you will need to implement the
``wait_prepare()`` and ``wait_finish()`` callbacks to unlock/lock if
applicable.
If you use the ``queue->lock`` pointer, then you can use the helper functions
diff --git a/Documentation/driver-api/media/v4l2-videobuf.rst
b/Documentation/driver-api/media/v4l2-videobuf.rst
deleted file mode 100644
index 4b1d84eefeb8..000000000000
diff --git a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
index a88fcbc11eca..9cc97ec75d7a 100644
--- a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
+++ b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
@@ -768,18 +768,6 @@ const char *video_device_node_name(struct video_device
*vdev);
æ¤åè½ï¼èéè®¿é® video_device::num å video_device::minor åã
-è§é¢ç¼å²è¾
å©å½æ°
----------------
-
-v4l2 æ ¸å¿ API æä¾äºä¸ä¸ªå¤çè§é¢ç¼å²çæ
åæ¹æ³(称为âvideobufâ)ã
-è¿äºæ¹æ³ä½¿é©±å¨å¯ä»¥éè¿ç»ä¸çæ¹å¼å®ç° read()ãmmap() å
overlay()ã
-ç®åå¨è®¾å¤ä¸æ¯æè§é¢ç¼å²çæ¹æ³æåæ£/èé
DMA(videobuf-dma-sg)ã
-çº¿æ§ DMA(videobuf-dma-contig)以å大å¤ç¨äº USB 设å¤çç¨ vmalloc
-åé
çç¼å²(videobuf-vmalloc)ã
-
-请åé
Documentation/driver-api/media/v4l2-videobuf.rstï¼ä»¥è·å¾æ´å¤å
³äº videobuf
-å±ç使ç¨ä¿¡æ¯ã
-
v4l2_fh ç»æä½
-------------
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index f77ebd688cde..331b8e535e5b 100644
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -82,19 +82,3 @@ config V4L2_CCI_I2C
depends on I2C
select REGMAP_I2C
select V4L2_CCI
-
-# Used by drivers that need Videobuf modules
-config VIDEOBUF_GEN
- tristate
-
-config VIDEOBUF_DMA_SG
- tristate
- select VIDEOBUF_GEN
-
-config VIDEOBUF_VMALLOC
- tristate
- select VIDEOBUF_GEN
-
-config VIDEOBUF_DMA_CONTIG
- tristate
- select VIDEOBUF_GEN
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index be2551705755..2177b9d63a8f 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -33,10 +33,5 @@ obj-$(CONFIG_V4L2_JPEG_HELPER) += v4l2-jpeg.o
obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
obj-$(CONFIG_V4L2_VP9) += v4l2-vp9.o
-obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
-obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
-obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
-obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
-
obj-$(CONFIG_VIDEO_TUNER) += tuner.o
obj-$(CONFIG_VIDEO_DEV) += v4l2-dv-timings.o videodev.o
diff --git a/drivers/media/v4l2-core/videobuf-core.c
b/drivers/media/v4l2-core/videobuf-core.c
deleted file mode 100644
index 606a271bdd2d..000000000000
diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c
b/drivers/media/v4l2-core/videobuf-dma-contig.c
deleted file mode 100644
index 4c2ec7a0d804..000000000000
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c
b/drivers/media/v4l2-core/videobuf-dma-sg.c
deleted file mode 100644
index 405b89ea1054..000000000000
diff --git a/drivers/media/v4l2-core/videobuf-vmalloc.c
b/drivers/media/v4l2-core/videobuf-vmalloc.c
deleted file mode 100644
index 85c7090606d6..000000000000
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
deleted file mode 100644
index 2e01b2e9a1c0..000000000000
diff --git a/include/media/videobuf-dma-contig.h
b/include/media/videobuf-dma-contig.h
deleted file mode 100644
index 525883b2c53e..000000000000
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
deleted file mode 100644
index 930ff8d454fc..000000000000
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
deleted file mode 100644
index e930dbb9d7f4..000000000000
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
