Quite a few drivers and even the vb2 framework still contain references to the old videobuf framework, even though they don't use that anymore. Typically this is either in dead code (ngene), or using the term videobuf/video-buf when either vb2 or 'video buffer' is meant. There are also a few functions that use _videobuf_ where _video_buf_ is more appropriate. This series cleans up the terminology, and this also makes it easier to identify the remaining drivers that actually use the old videobuf framework. No code was changed, it is all comments or renaming functions. Regards, Hans Hans Verkuil (6): media/pci/ngene/ngene.h: remove #ifdef NGENE_V4L vb2: videobuf -> videobuf2 media/v4l2-mem2mem.h: rename 'videobuf' to 'vb2' media: platform: ti: avoid using 'videobuf' or 'video-buf' staging/media/omap4iss/iss_video.c: videobuf -> vb2 media: avoid use of 'videobuf' .../driver-api/media/drivers/pxa_camera.rst | 2 +- .../media/common/videobuf2/videobuf2-core.c | 14 ++-- .../media/common/videobuf2/videobuf2-dvb.c | 4 +- .../media/common/videobuf2/videobuf2-v4l2.c | 4 +- drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- drivers/media/pci/ngene/ngene.h | 78 ------------------- .../media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- drivers/media/platform/intel/pxa_camera.c | 8 +- drivers/media/platform/marvell/mcam-core.h | 2 +- .../media/platform/renesas/vsp1/vsp1_video.c | 2 +- .../platform/samsung/exynos4-is/fimc-core.h | 2 +- .../media/platform/samsung/s5p-mfc/s5p_mfc.c | 2 +- .../media/platform/ti/am437x/am437x-vpfe.h | 2 +- drivers/media/platform/ti/davinci/vpif.h | 60 +++++++------- .../media/platform/ti/davinci/vpif_capture.c | 6 +- .../media/platform/ti/davinci/vpif_capture.h | 2 +- .../media/platform/ti/davinci/vpif_display.c | 6 +- .../media/platform/ti/davinci/vpif_display.h | 6 +- drivers/media/platform/ti/omap3isp/ispvideo.c | 2 +- drivers/media/test-drivers/vim2m.c | 2 +- drivers/media/usb/airspy/airspy.c | 2 +- drivers/media/usb/au0828/au0828-video.c | 4 +- drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- drivers/media/usb/em28xx/em28xx-video.c | 4 +- drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- drivers/staging/media/omap4iss/iss_video.c | 2 +- include/media/davinci/vpbe_display.h | 6 +- include/media/v4l2-mem2mem.h | 12 +-- include/media/videobuf2-core.h | 16 ++-- include/media/videobuf2-dvb.h | 2 +- 33 files changed, 96 insertions(+), 174 deletions(-) -- 2.35.1