tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] media: videobuf2: Replace videobuf2-core with videobuf2-v4l2

Make videobuf2-v4l2 as a wrapper of videobuf2-core for v4l2-use.
And replace videobuf2-core.h with videobuf2-v4l2.h.
This renaming change should be accompanied by the modifications
of all device drivers that include videobuf2-core.h.
It can be done with just running this shell script.

replace()
{
str1=$1
str2=$2
dir=$3
for file in $(find $dir -name *.h -o -name *.c -o -name Makefile)
do
echo $file
sed "s/$str1/$str2/g" $file > $file.out
mv $file.out $file
done
}

replace "videobuf2-core" "videobuf2-v4l2" "include/media/"
replace "videobuf2-core" "videobuf2-v4l2" "drivers/media/"
replace "videobuf2-core" "videobuf2-v4l2" "drivers/usb/gadget/"
replace "videobuf2-core" "videobuf2-v4l2" "drivers/staging/media/"

Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Junghak Sung and committed by
Mauro Carvalho Chehab c139990e a8077734

+111 -63
+1 -1
drivers/media/pci/solo6x10/solo6x10.h
··· 35 35 #include <media/v4l2-dev.h> 36 36 #include <media/v4l2-device.h> 37 37 #include <media/v4l2-ctrls.h> 38 - #include <media/videobuf2-core.h> 38 + #include <media/videobuf2-v4l2.h> 39 39 40 40 #include "solo6x10-regs.h" 41 41
+1 -1
drivers/media/platform/coda/coda-bit.c
··· 25 25 #include <media/v4l2-ctrls.h> 26 26 #include <media/v4l2-fh.h> 27 27 #include <media/v4l2-mem2mem.h> 28 - #include <media/videobuf2-core.h> 28 + #include <media/videobuf2-v4l2.h> 29 29 #include <media/videobuf2-dma-contig.h> 30 30 #include <media/videobuf2-vmalloc.h> 31 31
+1 -1
drivers/media/platform/coda/coda-common.c
··· 36 36 #include <media/v4l2-event.h> 37 37 #include <media/v4l2-ioctl.h> 38 38 #include <media/v4l2-mem2mem.h> 39 - #include <media/videobuf2-core.h> 39 + #include <media/videobuf2-v4l2.h> 40 40 #include <media/videobuf2-dma-contig.h> 41 41 #include <media/videobuf2-vmalloc.h> 42 42
+1 -1
drivers/media/platform/coda/coda.h
··· 24 24 #include <media/v4l2-ctrls.h> 25 25 #include <media/v4l2-device.h> 26 26 #include <media/v4l2-fh.h> 27 - #include <media/videobuf2-core.h> 27 + #include <media/videobuf2-v4l2.h> 28 28 29 29 #include "coda_regs.h" 30 30
+1 -1
drivers/media/platform/coda/trace.h
··· 5 5 #define __CODA_TRACE_H__ 6 6 7 7 #include <linux/tracepoint.h> 8 - #include <media/videobuf2-core.h> 8 + #include <media/videobuf2-v4l2.h> 9 9 10 10 #include "coda.h" 11 11
+1 -1
drivers/media/platform/exynos-gsc/gsc-core.h
··· 19 19 #include <linux/videodev2.h> 20 20 #include <linux/io.h> 21 21 #include <linux/pm_runtime.h> 22 - #include <media/videobuf2-core.h> 22 + #include <media/videobuf2-v4l2.h> 23 23 #include <media/v4l2-ctrls.h> 24 24 #include <media/v4l2-device.h> 25 25 #include <media/v4l2-mem2mem.h>
+1 -1
drivers/media/platform/exynos4-is/fimc-capture.c
··· 24 24 #include <media/v4l2-device.h> 25 25 #include <media/v4l2-ioctl.h> 26 26 #include <media/v4l2-mem2mem.h> 27 - #include <media/videobuf2-core.h> 27 + #include <media/videobuf2-v4l2.h> 28 28 #include <media/videobuf2-dma-contig.h> 29 29 30 30 #include "common.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-core.c
··· 27 27 #include <linux/slab.h> 28 28 #include <linux/clk.h> 29 29 #include <media/v4l2-ioctl.h> 30 - #include <media/videobuf2-core.h> 30 + #include <media/videobuf2-v4l2.h> 31 31 #include <media/videobuf2-dma-contig.h> 32 32 33 33 #include "fimc-core.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-core.h
··· 22 22 #include <linux/sizes.h> 23 23 24 24 #include <media/media-entity.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 #include <media/v4l2-ctrls.h> 27 27 #include <media/v4l2-device.h> 28 28 #include <media/v4l2-mem2mem.h>
+1 -1
drivers/media/platform/exynos4-is/fimc-is.h
··· 22 22 #include <linux/sizes.h> 23 23 #include <linux/spinlock.h> 24 24 #include <linux/types.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 #include <media/v4l2-ctrls.h> 27 27 28 28 #include "fimc-isp.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-isp-video.c
··· 28 28 29 29 #include <media/v4l2-device.h> 30 30 #include <media/v4l2-ioctl.h> 31 - #include <media/videobuf2-core.h> 31 + #include <media/videobuf2-v4l2.h> 32 32 #include <media/videobuf2-dma-contig.h> 33 33 #include <media/exynos-fimc.h> 34 34
+1 -1
drivers/media/platform/exynos4-is/fimc-isp-video.h
··· 11 11 #ifndef FIMC_ISP_VIDEO__ 12 12 #define FIMC_ISP_VIDEO__ 13 13 14 - #include <media/videobuf2-core.h> 14 + #include <media/videobuf2-v4l2.h> 15 15 #include "fimc-isp.h" 16 16 17 17 #ifdef CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE
+1 -1
drivers/media/platform/exynos4-is/fimc-isp.h
··· 21 21 #include <linux/videodev2.h> 22 22 23 23 #include <media/media-entity.h> 24 - #include <media/videobuf2-core.h> 24 + #include <media/videobuf2-v4l2.h> 25 25 #include <media/v4l2-device.h> 26 26 #include <media/v4l2-mediabus.h> 27 27 #include <media/exynos-fimc.h>
+1 -1
drivers/media/platform/exynos4-is/fimc-lite.c
··· 28 28 #include <media/v4l2-device.h> 29 29 #include <media/v4l2-ioctl.h> 30 30 #include <media/v4l2-mem2mem.h> 31 - #include <media/videobuf2-core.h> 31 + #include <media/videobuf2-v4l2.h> 32 32 #include <media/videobuf2-dma-contig.h> 33 33 #include <media/exynos-fimc.h> 34 34
+1 -1
drivers/media/platform/exynos4-is/fimc-lite.h
··· 19 19 #include <linux/videodev2.h> 20 20 21 21 #include <media/media-entity.h> 22 - #include <media/videobuf2-core.h> 22 + #include <media/videobuf2-v4l2.h> 23 23 #include <media/v4l2-ctrls.h> 24 24 #include <media/v4l2-device.h> 25 25 #include <media/v4l2-mediabus.h>
+1 -1
drivers/media/platform/exynos4-is/fimc-m2m.c
··· 24 24 #include <linux/slab.h> 25 25 #include <linux/clk.h> 26 26 #include <media/v4l2-ioctl.h> 27 - #include <media/videobuf2-core.h> 27 + #include <media/videobuf2-v4l2.h> 28 28 #include <media/videobuf2-dma-contig.h> 29 29 30 30 #include "common.h"
+1 -1
drivers/media/platform/marvell-ccic/mcam-core.h
··· 10 10 #include <media/v4l2-common.h> 11 11 #include <media/v4l2-ctrls.h> 12 12 #include <media/v4l2-dev.h> 13 - #include <media/videobuf2-core.h> 13 + #include <media/videobuf2-v4l2.h> 14 14 15 15 /* 16 16 * Create our own symbols for the supported buffer modes, but, for now,
+1 -1
drivers/media/platform/omap3isp/ispvideo.h
··· 20 20 #include <media/media-entity.h> 21 21 #include <media/v4l2-dev.h> 22 22 #include <media/v4l2-fh.h> 23 - #include <media/videobuf2-core.h> 23 + #include <media/videobuf2-v4l2.h> 24 24 25 25 #define ISP_VIDEO_DRIVER_NAME "ispvideo" 26 26 #define ISP_VIDEO_DRIVER_VERSION "0.0.2"
+1 -1
drivers/media/platform/rcar_jpu.c
··· 37 37 #include <media/v4l2-fh.h> 38 38 #include <media/v4l2-mem2mem.h> 39 39 #include <media/v4l2-ioctl.h> 40 - #include <media/videobuf2-core.h> 40 + #include <media/videobuf2-v4l2.h> 41 41 #include <media/videobuf2-dma-contig.h> 42 42 43 43
+1 -1
drivers/media/platform/s3c-camif/camif-capture.c
··· 34 34 #include <media/v4l2-ctrls.h> 35 35 #include <media/v4l2-event.h> 36 36 #include <media/v4l2-ioctl.h> 37 - #include <media/videobuf2-core.h> 37 + #include <media/videobuf2-v4l2.h> 38 38 #include <media/videobuf2-dma-contig.h> 39 39 40 40 #include "camif-core.h"
+1 -1
drivers/media/platform/s3c-camif/camif-core.c
··· 32 32 #include <media/media-device.h> 33 33 #include <media/v4l2-ctrls.h> 34 34 #include <media/v4l2-ioctl.h> 35 - #include <media/videobuf2-core.h> 35 + #include <media/videobuf2-v4l2.h> 36 36 #include <media/videobuf2-dma-contig.h> 37 37 38 38 #include "camif-core.h"
+1 -1
drivers/media/platform/s3c-camif/camif-core.h
··· 25 25 #include <media/v4l2-dev.h> 26 26 #include <media/v4l2-device.h> 27 27 #include <media/v4l2-mediabus.h> 28 - #include <media/videobuf2-core.h> 28 + #include <media/videobuf2-v4l2.h> 29 29 #include <media/s3c_camif.h> 30 30 31 31 #define S3C_CAMIF_DRIVER_NAME "s3c-camif"
+1 -1
drivers/media/platform/s5p-g2d/g2d.c
··· 23 23 #include <media/v4l2-mem2mem.h> 24 24 #include <media/v4l2-device.h> 25 25 #include <media/v4l2-ioctl.h> 26 - #include <media/videobuf2-core.h> 26 + #include <media/videobuf2-v4l2.h> 27 27 #include <media/videobuf2-dma-contig.h> 28 28 29 29 #include "g2d.h"
+1 -1
drivers/media/platform/s5p-jpeg/jpeg-core.c
··· 26 26 #include <linux/string.h> 27 27 #include <media/v4l2-mem2mem.h> 28 28 #include <media/v4l2-ioctl.h> 29 - #include <media/videobuf2-core.h> 29 + #include <media/videobuf2-v4l2.h> 30 30 #include <media/videobuf2-dma-contig.h> 31 31 32 32 #include "jpeg-core.h"
+1 -1
drivers/media/platform/s5p-mfc/s5p_mfc.c
··· 22 22 #include <media/v4l2-event.h> 23 23 #include <linux/workqueue.h> 24 24 #include <linux/of.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 #include "s5p_mfc_common.h" 27 27 #include "s5p_mfc_ctrl.h" 28 28 #include "s5p_mfc_debug.h"
+1 -1
drivers/media/platform/s5p-mfc/s5p_mfc_common.h
··· 21 21 #include <media/v4l2-ctrls.h> 22 22 #include <media/v4l2-device.h> 23 23 #include <media/v4l2-ioctl.h> 24 - #include <media/videobuf2-core.h> 24 + #include <media/videobuf2-v4l2.h> 25 25 #include "regs-mfc.h" 26 26 #include "regs-mfc-v8.h" 27 27
+1 -1
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
··· 22 22 #include <linux/workqueue.h> 23 23 #include <media/v4l2-ctrls.h> 24 24 #include <media/v4l2-event.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 #include "s5p_mfc_common.h" 27 27 #include "s5p_mfc_ctrl.h" 28 28 #include "s5p_mfc_debug.h"
+1 -1
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
··· 23 23 #include <media/v4l2-event.h> 24 24 #include <linux/workqueue.h> 25 25 #include <media/v4l2-ctrls.h> 26 - #include <media/videobuf2-core.h> 26 + #include <media/videobuf2-v4l2.h> 27 27 #include "s5p_mfc_common.h" 28 28 #include "s5p_mfc_ctrl.h" 29 29 #include "s5p_mfc_debug.h"
+1 -1
drivers/media/platform/s5p-tv/mixer.h
··· 24 24 #include <linux/spinlock.h> 25 25 #include <linux/wait.h> 26 26 #include <media/v4l2-device.h> 27 - #include <media/videobuf2-core.h> 27 + #include <media/videobuf2-v4l2.h> 28 28 29 29 #include "regs-mixer.h" 30 30
+1 -1
drivers/media/platform/soc_camera/mx2_camera.c
··· 32 32 33 33 #include <media/v4l2-common.h> 34 34 #include <media/v4l2-dev.h> 35 - #include <media/videobuf2-core.h> 35 + #include <media/videobuf2-v4l2.h> 36 36 #include <media/videobuf2-dma-contig.h> 37 37 #include <media/soc_camera.h> 38 38 #include <media/soc_mediabus.h>
+1 -1
drivers/media/platform/soc_camera/soc_camera.c
··· 38 38 #include <media/v4l2-dev.h> 39 39 #include <media/v4l2-of.h> 40 40 #include <media/videobuf-core.h> 41 - #include <media/videobuf2-core.h> 41 + #include <media/videobuf2-v4l2.h> 42 42 43 43 /* Default to VGA resolution */ 44 44 #define DEFAULT_WIDTH 640
+1 -1
drivers/media/platform/ti-vpe/vpe.c
··· 40 40 #include <media/v4l2-event.h> 41 41 #include <media/v4l2-ioctl.h> 42 42 #include <media/v4l2-mem2mem.h> 43 - #include <media/videobuf2-core.h> 43 + #include <media/videobuf2-v4l2.h> 44 44 #include <media/videobuf2-dma-contig.h> 45 45 46 46 #include "vpdma.h"
+1 -1
drivers/media/platform/vivid/vivid-core.h
··· 21 21 #define _VIVID_CORE_H_ 22 22 23 23 #include <linux/fb.h> 24 - #include <media/videobuf2-core.h> 24 + #include <media/videobuf2-v4l2.h> 25 25 #include <media/v4l2-device.h> 26 26 #include <media/v4l2-dev.h> 27 27 #include <media/v4l2-ctrls.h>
+1 -1
drivers/media/platform/vsp1/vsp1_video.c
··· 24 24 #include <media/v4l2-fh.h> 25 25 #include <media/v4l2-ioctl.h> 26 26 #include <media/v4l2-subdev.h> 27 - #include <media/videobuf2-core.h> 27 + #include <media/videobuf2-v4l2.h> 28 28 #include <media/videobuf2-dma-contig.h> 29 29 30 30 #include "vsp1.h"
+1 -1
drivers/media/platform/vsp1/vsp1_video.h
··· 18 18 #include <linux/wait.h> 19 19 20 20 #include <media/media-entity.h> 21 - #include <media/videobuf2-core.h> 21 + #include <media/videobuf2-v4l2.h> 22 22 23 23 struct vsp1_video; 24 24
+1 -1
drivers/media/platform/xilinx/xilinx-dma.c
··· 22 22 #include <media/v4l2-dev.h> 23 23 #include <media/v4l2-fh.h> 24 24 #include <media/v4l2-ioctl.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 #include <media/videobuf2-dma-contig.h> 27 27 28 28 #include "xilinx-dma.h"
+1 -1
drivers/media/platform/xilinx/xilinx-dma.h
··· 22 22 23 23 #include <media/media-entity.h> 24 24 #include <media/v4l2-dev.h> 25 - #include <media/videobuf2-core.h> 25 + #include <media/videobuf2-v4l2.h> 26 26 27 27 struct dma_chan; 28 28 struct xvip_composite_device;
+1 -1
drivers/media/usb/go7007/go7007-priv.h
··· 20 20 #include <media/v4l2-device.h> 21 21 #include <media/v4l2-ctrls.h> 22 22 #include <media/v4l2-fh.h> 23 - #include <media/videobuf2-core.h> 23 + #include <media/videobuf2-v4l2.h> 24 24 25 25 struct go7007; 26 26
+1 -1
drivers/media/usb/stk1160/stk1160.h
··· 23 23 #include <linux/i2c.h> 24 24 #include <sound/core.h> 25 25 #include <sound/ac97_codec.h> 26 - #include <media/videobuf2-core.h> 26 + #include <media/videobuf2-v4l2.h> 27 27 #include <media/v4l2-device.h> 28 28 #include <media/v4l2-ctrls.h> 29 29
+1 -1
drivers/media/usb/usbtv/usbtv-video.c
··· 29 29 */ 30 30 31 31 #include <media/v4l2-ioctl.h> 32 - #include <media/videobuf2-core.h> 32 + #include <media/videobuf2-v4l2.h> 33 33 34 34 #include "usbtv.h" 35 35
+1 -1
drivers/media/usb/uvc/uvcvideo.h
··· 15 15 #include <media/v4l2-device.h> 16 16 #include <media/v4l2-event.h> 17 17 #include <media/v4l2-fh.h> 18 - #include <media/videobuf2-core.h> 18 + #include <media/videobuf2-v4l2.h> 19 19 20 20 /* -------------------------------------------------------------------------- 21 21 * UVC constants
+1 -1
drivers/media/v4l2-core/Makefile
··· 33 33 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o 34 34 obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o 35 35 36 - obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o 36 + obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o 37 37 obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o 38 38 obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o 39 39 obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
+1 -1
drivers/media/v4l2-core/v4l2-ioctl.c
··· 26 26 #include <media/v4l2-fh.h> 27 27 #include <media/v4l2-event.h> 28 28 #include <media/v4l2-device.h> 29 - #include <media/videobuf2-core.h> 29 + #include <media/videobuf2-v4l2.h> 30 30 31 31 #include <trace/events/v4l2.h> 32 32
+1 -1
drivers/media/v4l2-core/v4l2-mem2mem.c
··· 17 17 #include <linux/sched.h> 18 18 #include <linux/slab.h> 19 19 20 - #include <media/videobuf2-core.h> 20 + #include <media/videobuf2-v4l2.h> 21 21 #include <media/v4l2-mem2mem.h> 22 22 #include <media/v4l2-dev.h> 23 23 #include <media/v4l2-fh.h>
+1 -1
drivers/media/v4l2-core/v4l2-trace.c
··· 1 1 #include <media/v4l2-common.h> 2 2 #include <media/v4l2-fh.h> 3 - #include <media/videobuf2-core.h> 3 + #include <media/videobuf2-v4l2.h> 4 4 5 5 #define CREATE_TRACE_POINTS 6 6 #include <trace/events/v4l2.h>
+5 -5
drivers/media/v4l2-core/videobuf2-core.c
··· 1 1 /* 2 - * videobuf2-core.c - V4L2 driver helper framework 2 + * videobuf2-core.c - video buffer 2 core framework 3 3 * 4 4 * Copyright (C) 2010 Samsung Electronics 5 5 * ··· 28 28 #include <media/v4l2-fh.h> 29 29 #include <media/v4l2-event.h> 30 30 #include <media/v4l2-common.h> 31 - #include <media/videobuf2-core.h> 31 + #include <media/videobuf2-v4l2.h> 32 32 33 33 #include <trace/events/v4l2.h> 34 34 ··· 1818 1818 /* 1819 1819 * If you see this warning, then the driver isn't cleaning up properly 1820 1820 * after a failed start_streaming(). See the start_streaming() 1821 - * documentation in videobuf2-core.h for more information how buffers 1821 + * documentation in videobuf2-v4l2.h for more information how buffers 1822 1822 * should be returned to vb2 in start_streaming(). 1823 1823 */ 1824 1824 if (WARN_ON(atomic_read(&q->owned_by_drv_count))) { ··· 2205 2205 /* 2206 2206 * If you see this warning, then the driver isn't cleaning up properly 2207 2207 * in stop_streaming(). See the stop_streaming() documentation in 2208 - * videobuf2-core.h for more information how buffers should be returned 2208 + * videobuf2-v4l2.h for more information how buffers should be returned 2209 2209 * to vb2 in stop_streaming(). 2210 2210 */ 2211 2211 if (WARN_ON(atomic_read(&q->owned_by_drv_count))) { ··· 2739 2739 * responsible of clearing it's content and setting initial values for some 2740 2740 * required entries before calling this function. 2741 2741 * q->ops, q->mem_ops, q->type and q->io_modes are mandatory. Please refer 2742 - * to the struct vb2_queue description in include/media/videobuf2-core.h 2742 + * to the struct vb2_queue description in include/media/videobuf2-v4l2.h 2743 2743 * for more information. 2744 2744 */ 2745 2745 int vb2_queue_init(struct vb2_queue *q)
+1 -1
drivers/media/v4l2-core/videobuf2-dma-contig.c
··· 17 17 #include <linux/slab.h> 18 18 #include <linux/dma-mapping.h> 19 19 20 - #include <media/videobuf2-core.h> 20 + #include <media/videobuf2-v4l2.h> 21 21 #include <media/videobuf2-dma-contig.h> 22 22 #include <media/videobuf2-memops.h> 23 23
+1 -1
drivers/media/v4l2-core/videobuf2-dma-sg.c
··· 17 17 #include <linux/slab.h> 18 18 #include <linux/vmalloc.h> 19 19 20 - #include <media/videobuf2-core.h> 20 + #include <media/videobuf2-v4l2.h> 21 21 #include <media/videobuf2-memops.h> 22 22 #include <media/videobuf2-dma-sg.h> 23 23
+1 -1
drivers/media/v4l2-core/videobuf2-memops.c
··· 19 19 #include <linux/sched.h> 20 20 #include <linux/file.h> 21 21 22 - #include <media/videobuf2-core.h> 22 + #include <media/videobuf2-v4l2.h> 23 23 #include <media/videobuf2-memops.h> 24 24 25 25 /**
+31
drivers/media/v4l2-core/videobuf2-v4l2.c
··· 1 + /* 2 + * videobuf2-v4l2.c - V4L2 driver helper framework 3 + * 4 + * Copyright (C) 2010 Samsung Electronics 5 + * 6 + * Author: Pawel Osciak <pawel@osciak.com> 7 + * Marek Szyprowski <m.szyprowski@samsung.com> 8 + * 9 + * The vb2_thread implementation was based on code from videobuf-dvb.c: 10 + * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs] 11 + * 12 + * This program is free software; you can redistribute it and/or modify 13 + * it under the terms of the GNU General Public License as published by 14 + * the Free Software Foundation. 15 + */ 16 + 17 + #include <linux/err.h> 18 + #include <linux/kernel.h> 19 + #include <linux/module.h> 20 + #include <linux/mm.h> 21 + #include <linux/poll.h> 22 + #include <linux/slab.h> 23 + #include <linux/sched.h> 24 + #include <linux/freezer.h> 25 + #include <linux/kthread.h> 26 + 27 + #include <media/videobuf2-v4l2.h> 28 + 29 + MODULE_DESCRIPTION("Driver helper framework for Video for Linux 2"); 30 + MODULE_AUTHOR("Pawel Osciak <pawel@osciak.com>, Marek Szyprowski"); 31 + MODULE_LICENSE("GPL");
+1 -1
drivers/media/v4l2-core/videobuf2-vmalloc.c
··· 17 17 #include <linux/slab.h> 18 18 #include <linux/vmalloc.h> 19 19 20 - #include <media/videobuf2-core.h> 20 + #include <media/videobuf2-v4l2.h> 21 21 #include <media/videobuf2-vmalloc.h> 22 22 #include <media/videobuf2-memops.h> 23 23
+1 -1
drivers/staging/media/omap4iss/iss_video.h
··· 18 18 #include <media/media-entity.h> 19 19 #include <media/v4l2-dev.h> 20 20 #include <media/v4l2-fh.h> 21 - #include <media/videobuf2-core.h> 21 + #include <media/videobuf2-v4l2.h> 22 22 #include <media/videobuf2-dma-contig.h> 23 23 24 24 #define ISS_VIDEO_DRIVER_NAME "issvideo"
+1 -1
drivers/usb/gadget/function/uvc_queue.h
··· 6 6 #include <linux/kernel.h> 7 7 #include <linux/poll.h> 8 8 #include <linux/videodev2.h> 9 - #include <media/videobuf2-core.h> 9 + #include <media/videobuf2-v4l2.h> 10 10 11 11 /* Maximum frame size in bytes, for sanity checking. */ 12 12 #define UVC_MAX_FRAME_SIZE (16*1024*1024)
+1 -1
include/media/soc_camera.h
··· 18 18 #include <linux/pm.h> 19 19 #include <linux/videodev2.h> 20 20 #include <media/videobuf-core.h> 21 - #include <media/videobuf2-core.h> 21 + #include <media/videobuf2-v4l2.h> 22 22 #include <media/v4l2-async.h> 23 23 #include <media/v4l2-ctrls.h> 24 24 #include <media/v4l2-device.h>
+1 -1
include/media/v4l2-mem2mem.h
··· 17 17 #ifndef _MEDIA_V4L2_MEM2MEM_H 18 18 #define _MEDIA_V4L2_MEM2MEM_H 19 19 20 - #include <media/videobuf2-core.h> 20 + #include <media/videobuf2-v4l2.h> 21 21 22 22 /** 23 23 * struct v4l2_m2m_ops - mem-to-mem device driver callbacks
+1 -1
include/media/videobuf2-core.h
··· 1 1 /* 2 - * videobuf2-core.h - V4L2 driver helper framework 2 + * videobuf2-core.h - Video Buffer 2 Core Framework 3 3 * 4 4 * Copyright (C) 2010 Samsung Electronics 5 5 *
+1 -1
include/media/videobuf2-dma-contig.h
··· 13 13 #ifndef _MEDIA_VIDEOBUF2_DMA_CONTIG_H 14 14 #define _MEDIA_VIDEOBUF2_DMA_CONTIG_H 15 15 16 - #include <media/videobuf2-core.h> 16 + #include <media/videobuf2-v4l2.h> 17 17 #include <linux/dma-mapping.h> 18 18 19 19 static inline dma_addr_t
+1 -1
include/media/videobuf2-dma-sg.h
··· 13 13 #ifndef _MEDIA_VIDEOBUF2_DMA_SG_H 14 14 #define _MEDIA_VIDEOBUF2_DMA_SG_H 15 15 16 - #include <media/videobuf2-core.h> 16 + #include <media/videobuf2-v4l2.h> 17 17 18 18 static inline struct sg_table *vb2_dma_sg_plane_desc( 19 19 struct vb2_buffer *vb, unsigned int plane_no)
+1 -1
include/media/videobuf2-memops.h
··· 14 14 #ifndef _MEDIA_VIDEOBUF2_MEMOPS_H 15 15 #define _MEDIA_VIDEOBUF2_MEMOPS_H 16 16 17 - #include <media/videobuf2-core.h> 17 + #include <media/videobuf2-v4l2.h> 18 18 #include <linux/mm.h> 19 19 20 20 /**
+17
include/media/videobuf2-v4l2.h
··· 1 + /* 2 + * videobuf2-v4l2.h - V4L2 driver helper framework 3 + * 4 + * Copyright (C) 2010 Samsung Electronics 5 + * 6 + * Author: Pawel Osciak <pawel@osciak.com> 7 + * 8 + * This program is free software; you can redistribute it and/or modify 9 + * it under the terms of the GNU General Public License as published by 10 + * the Free Software Foundation. 11 + */ 12 + #ifndef _MEDIA_VIDEOBUF2_V4L2_H 13 + #define _MEDIA_VIDEOBUF2_V4L2_H 14 + 15 + #include <media/videobuf2-core.h> 16 + 17 + #endif /* _MEDIA_VIDEOBUF2_V4L2_H */
+1 -1
include/media/videobuf2-vmalloc.h
··· 13 13 #ifndef _MEDIA_VIDEOBUF2_VMALLOC_H 14 14 #define _MEDIA_VIDEOBUF2_VMALLOC_H 15 15 16 - #include <media/videobuf2-core.h> 16 + #include <media/videobuf2-v4l2.h> 17 17 18 18 extern const struct vb2_mem_ops vb2_vmalloc_memops; 19 19