From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 8 Jan 2018 20:20:01 +0000 (-0500)
Subject: media: drivers/media/common/videobuf2: rename from videobuf
X-Git-Tag: v4.16-rc1~57^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7952be9b6ece3d3c4d61f9811d7e5a984580064a;p=thirdparty%2Fkernel%2Flinux.git

media: drivers/media/common/videobuf2: rename from videobuf

This directory contains the videobuf2 framework, so name the
directory accordingly.

The name 'videobuf' typically refers to the old and deprecated
videobuf version 1 framework so that was confusing.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index cdfc905967dc9..0cb7d819a5d21 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -16,7 +16,7 @@ config CYPRESS_FIRMWARE
 	tristate "Cypress firmware helper routines"
 	depends on USB
 
-source "drivers/media/common/videobuf/Kconfig"
+source "drivers/media/common/videobuf2/Kconfig"
 source "drivers/media/common/b2c2/Kconfig"
 source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index f24b5ed399820..e7bc17abbbbce 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,4 +1,4 @@
-obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf/
+obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
diff --git a/drivers/media/common/videobuf/Kconfig b/drivers/media/common/videobuf2/Kconfig
similarity index 100%
rename from drivers/media/common/videobuf/Kconfig
rename to drivers/media/common/videobuf2/Kconfig
diff --git a/drivers/media/common/videobuf/Makefile b/drivers/media/common/videobuf2/Makefile
similarity index 100%
rename from drivers/media/common/videobuf/Makefile
rename to drivers/media/common/videobuf2/Makefile
diff --git a/drivers/media/common/videobuf/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-core.c
rename to drivers/media/common/videobuf2/videobuf2-core.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dma-contig.c
rename to drivers/media/common/videobuf2/videobuf2-dma-contig.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dma-sg.c
rename to drivers/media/common/videobuf2/videobuf2-dma-sg.c
diff --git a/drivers/media/common/videobuf/videobuf2-dvb.c b/drivers/media/common/videobuf2/videobuf2-dvb.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dvb.c
rename to drivers/media/common/videobuf2/videobuf2-dvb.c
diff --git a/drivers/media/common/videobuf/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-memops.c
rename to drivers/media/common/videobuf2/videobuf2-memops.c
diff --git a/drivers/media/common/videobuf/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-v4l2.c
rename to drivers/media/common/videobuf2/videobuf2-v4l2.c
diff --git a/drivers/media/common/videobuf/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-vmalloc.c
rename to drivers/media/common/videobuf2/videobuf2-vmalloc.c