OSDN Git Service

media: cec: move the core to a separate directory
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 15 Apr 2020 08:43:44 +0000 (10:43 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 15 Apr 2020 09:44:05 +0000 (11:44 +0200)
In preparation for moving CEC drivers to the CEC directory,
move the core to a separate place.

Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/cec/Makefile
drivers/media/cec/core/Makefile [new file with mode: 0644]
drivers/media/cec/core/cec-adap.c [moved from drivers/media/cec/cec-adap.c with 100% similarity]
drivers/media/cec/core/cec-api.c [moved from drivers/media/cec/cec-api.c with 100% similarity]
drivers/media/cec/core/cec-core.c [moved from drivers/media/cec/cec-core.c with 100% similarity]
drivers/media/cec/core/cec-notifier.c [moved from drivers/media/cec/cec-notifier.c with 100% similarity]
drivers/media/cec/core/cec-pin-error-inj.c [moved from drivers/media/cec/cec-pin-error-inj.c with 100% similarity]
drivers/media/cec/core/cec-pin-priv.h [moved from drivers/media/cec/cec-pin-priv.h with 100% similarity]
drivers/media/cec/core/cec-pin.c [moved from drivers/media/cec/cec-pin.c with 100% similarity]
drivers/media/cec/core/cec-priv.h [moved from drivers/media/cec/cec-priv.h with 100% similarity]

index ad8677d..3fdbc22 100644 (file)
@@ -1,16 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0
-cec-objs := cec-core.o cec-adap.o cec-api.o
-
-ifeq ($(CONFIG_CEC_NOTIFIER),y)
-  cec-objs += cec-notifier.o
-endif
-
-ifeq ($(CONFIG_CEC_PIN),y)
-  cec-objs += cec-pin.o
-endif
-
-ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y)
-  cec-objs += cec-pin-error-inj.o
-endif
-
-obj-$(CONFIG_CEC_CORE) += cec.o
+obj-y += core/
diff --git a/drivers/media/cec/core/Makefile b/drivers/media/cec/core/Makefile
new file mode 100644 (file)
index 0000000..ad8677d
--- /dev/null
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+cec-objs := cec-core.o cec-adap.o cec-api.o
+
+ifeq ($(CONFIG_CEC_NOTIFIER),y)
+  cec-objs += cec-notifier.o
+endif
+
+ifeq ($(CONFIG_CEC_PIN),y)
+  cec-objs += cec-pin.o
+endif
+
+ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y)
+  cec-objs += cec-pin-error-inj.o
+endif
+
+obj-$(CONFIG_CEC_CORE) += cec.o