diff options
author | Junghak Sung <jh1009.sung@samsung.com> | 2015-09-22 09:30:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-10-01 07:48:18 -0400 |
commit | c139990e842d550db2f59bd4f5993bba90f140e0 (patch) | |
tree | e2fd815f8f6d52bd216e518b907fb847278bc649 /drivers/media/platform/coda | |
parent | a8077734055f870ba630563868a6349671ca8dfc (diff) |
[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>
Diffstat (limited to 'drivers/media/platform/coda')
-rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/coda/coda-common.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/coda/coda.h | 2 | ||||
-rw-r--r-- | drivers/media/platform/coda/trace.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index fd7819d8922d..cd41d49b206d 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <media/v4l2-ctrls.h> | 25 | #include <media/v4l2-ctrls.h> |
26 | #include <media/v4l2-fh.h> | 26 | #include <media/v4l2-fh.h> |
27 | #include <media/v4l2-mem2mem.h> | 27 | #include <media/v4l2-mem2mem.h> |
28 | #include <media/videobuf2-core.h> | 28 | #include <media/videobuf2-v4l2.h> |
29 | #include <media/videobuf2-dma-contig.h> | 29 | #include <media/videobuf2-dma-contig.h> |
30 | #include <media/videobuf2-vmalloc.h> | 30 | #include <media/videobuf2-vmalloc.h> |
31 | 31 | ||
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index a4654e0c104d..998fe6614b33 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <media/v4l2-event.h> | 36 | #include <media/v4l2-event.h> |
37 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
38 | #include <media/v4l2-mem2mem.h> | 38 | #include <media/v4l2-mem2mem.h> |
39 | #include <media/videobuf2-core.h> | 39 | #include <media/videobuf2-v4l2.h> |
40 | #include <media/videobuf2-dma-contig.h> | 40 | #include <media/videobuf2-dma-contig.h> |
41 | #include <media/videobuf2-vmalloc.h> | 41 | #include <media/videobuf2-vmalloc.h> |
42 | 42 | ||
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h index 59b2af9c7749..feb9671a12bd 100644 --- a/drivers/media/platform/coda/coda.h +++ b/drivers/media/platform/coda/coda.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <media/v4l2-ctrls.h> | 24 | #include <media/v4l2-ctrls.h> |
25 | #include <media/v4l2-device.h> | 25 | #include <media/v4l2-device.h> |
26 | #include <media/v4l2-fh.h> | 26 | #include <media/v4l2-fh.h> |
27 | #include <media/videobuf2-core.h> | 27 | #include <media/videobuf2-v4l2.h> |
28 | 28 | ||
29 | #include "coda_regs.h" | 29 | #include "coda_regs.h" |
30 | 30 | ||
diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/coda/trace.h index d9099a0f7c32..9db6a6662913 100644 --- a/drivers/media/platform/coda/trace.h +++ b/drivers/media/platform/coda/trace.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #define __CODA_TRACE_H__ | 5 | #define __CODA_TRACE_H__ |
6 | 6 | ||
7 | #include <linux/tracepoint.h> | 7 | #include <linux/tracepoint.h> |
8 | #include <media/videobuf2-core.h> | 8 | #include <media/videobuf2-v4l2.h> |
9 | 9 | ||
10 | #include "coda.h" | 10 | #include "coda.h" |
11 | 11 | ||