media: move drivers/media/media-* to drivers/media/mc/mc-*

It is really weird that the media controller sources are all top-level
in drivers/media. It is a bit of a left-over from long ago when most
media sources were all at the top-level. At some point we reorganized
the directory structure, but the media-*.c sources where never moved
to their own directory.

So create a new mc directory and move all sources there. Also rename
the prefix from media- to mc-.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index ce6782bc53ef95f73a205c0f62cc876420c254ae..21cd9c02960b8b96496b739159dac0c9a16a4e44 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -89,39 +89,7 @@ config MEDIA_CEC_SUPPORT
 
 source "drivers/media/cec/Kconfig"
 
-#
-# Media controller
-#      Selectable only for webcam/grabbers, as other drivers don't use it
-#
-
-config MEDIA_CONTROLLER
-       bool "Media Controller API"
-       depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
-       help
-         Enable the media controller API used to query media devices internal
-         topology and configure it dynamically.
-
-         This API is mostly used by camera interfaces in embedded platforms.
-
-config MEDIA_CONTROLLER_DVB
-       bool "Enable Media controller for DVB (EXPERIMENTAL)"
-       depends on MEDIA_CONTROLLER && DVB_CORE
-       help
-         Enable the media controller API support for DVB.
-
-         This is currently experimental.
-
-config MEDIA_CONTROLLER_REQUEST_API
-       bool "Enable Media controller Request API (EXPERIMENTAL)"
-       depends on MEDIA_CONTROLLER && STAGING_MEDIA
-       help
-         DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.
-
-         This option enables the Request API for the Media controller and V4L2
-         interfaces. It is currently needed by a few stateless codec drivers.
-
-         There is currently no intention to provide API or ABI stability for
-         this new API as of yet.
+source "drivers/media/mc/Kconfig"
 
 #
 # Video4Linux support

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 4a330d0e5e40002d60c480006b757aef3f49fbc7..f215f0a89f9e648eddde7f2d58fe2a2a58dee62f 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -3,15 +3,6 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-media-objs     := media-device.o media-devnode.o media-entity.o \
-                  media-request.o
-
-ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
-       ifeq ($(CONFIG_USB),y)
-               media-objs += media-dev-allocator.o
-       endif
-endif
-
 #
 # I2C drivers should come before other drivers, otherwise they'll fail
 # when compiled as builtin drivers
@@ -20,10 +11,10 @@ obj-y += i2c/ tuners/
 obj-$(CONFIG_DVB_CORE)  += dvb-frontends/
 
 #
-# Now, let's link-in the media core
+# Now, let's link-in the media controller core
 #
 ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
-  obj-$(CONFIG_MEDIA_SUPPORT) += media.o
+  obj-$(CONFIG_MEDIA_SUPPORT) += mc/
 endif
 
 obj-$(CONFIG_VIDEO_DEV) += v4l2-core/

diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig
new file mode 100644 (file)
index 0000000..3b9795c
--- /dev/null
+++ b/drivers/media/mc/Kconfig
@@ -0,0 +1,33 @@
+#
+# Media controller
+#      Selectable only for webcam/grabbers, as other drivers don't use it
+#
+
+config MEDIA_CONTROLLER
+       bool "Media Controller API"
+       depends on MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
+       help
+         Enable the media controller API used to query media devices internal
+         topology and configure it dynamically.
+
+         This API is mostly used by camera interfaces in embedded platforms.
+
+config MEDIA_CONTROLLER_DVB
+       bool "Enable Media controller for DVB (EXPERIMENTAL)"
+       depends on MEDIA_CONTROLLER && DVB_CORE
+       help
+         Enable the media controller API support for DVB.
+
+         This is currently experimental.
+
+config MEDIA_CONTROLLER_REQUEST_API
+       bool "Enable Media controller Request API (EXPERIMENTAL)"
+       depends on MEDIA_CONTROLLER && STAGING_MEDIA
+       help
+         DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.
+
+         This option enables the Request API for the Media controller and V4L2
+         interfaces. It is currently needed by a few stateless codec drivers.
+
+         There is currently no intention to provide API or ABI stability for
+         this new API as of yet.

diff --git a/drivers/media/mc/Makefile b/drivers/media/mc/Makefile
new file mode 100644 (file)
index 0000000..119037f
--- /dev/null
+++ b/drivers/media/mc/Makefile
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+
+mc-objs        := mc-device.o mc-devnode.o mc-entity.o \
+          mc-request.o
+
+ifeq ($(CONFIG_USB),y)
+       mc-objs += mc-dev-allocator.o
+endif
+
+obj-$(CONFIG_MEDIA_SUPPORT) += mc.o

diff --git a/drivers/media/media-dev-allocator.c b/drivers/media/mc/mc-dev-allocator.c
similarity index 100%
rename from drivers/media/media-dev-allocator.c
rename to drivers/media/mc/mc-dev-allocator.c

diff --git a/drivers/media/media-device.c b/drivers/media/mc/mc-device.c
similarity index 100%
rename from drivers/media/media-device.c
rename to drivers/media/mc/mc-device.c

diff --git a/drivers/media/media-devnode.c b/drivers/media/mc/mc-devnode.c
similarity index 100%
rename from drivers/media/media-devnode.c
rename to drivers/media/mc/mc-devnode.c

diff --git a/drivers/media/media-entity.c b/drivers/media/mc/mc-entity.c
similarity index 100%
rename from drivers/media/media-entity.c
rename to drivers/media/mc/mc-entity.c

diff --git a/drivers/media/media-request.c b/drivers/media/mc/mc-request.c
similarity index 100%
rename from drivers/media/media-request.c
rename to drivers/media/mc/mc-request.c