From de73b88c7ca1f3b214ba135d100afad42ddf7a2a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 15 Apr 2020 10:43:44 +0200 Subject: [PATCH] media: cec: move the core to a separate directory In preparation for moving CEC drivers to the CEC directory, move the core to a separate place. Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/cec/Makefile | 16 +--------------- drivers/media/cec/core/Makefile | 16 ++++++++++++++++ drivers/media/cec/{ => core}/cec-adap.c | 0 drivers/media/cec/{ => core}/cec-api.c | 0 drivers/media/cec/{ => core}/cec-core.c | 0 drivers/media/cec/{ => core}/cec-notifier.c | 0 drivers/media/cec/{ => core}/cec-pin-error-inj.c | 0 drivers/media/cec/{ => core}/cec-pin-priv.h | 0 drivers/media/cec/{ => core}/cec-pin.c | 0 drivers/media/cec/{ => core}/cec-priv.h | 0 10 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 drivers/media/cec/core/Makefile rename drivers/media/cec/{ => core}/cec-adap.c (100%) rename drivers/media/cec/{ => core}/cec-api.c (100%) rename drivers/media/cec/{ => core}/cec-core.c (100%) rename drivers/media/cec/{ => core}/cec-notifier.c (100%) rename drivers/media/cec/{ => core}/cec-pin-error-inj.c (100%) rename drivers/media/cec/{ => core}/cec-pin-priv.h (100%) rename drivers/media/cec/{ => core}/cec-pin.c (100%) rename drivers/media/cec/{ => core}/cec-priv.h (100%) diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile index ad8677d8c896..3fdbc22b1530 100644 --- a/drivers/media/cec/Makefile +++ b/drivers/media/cec/Makefile @@ -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 index 000000000000..ad8677d8c896 --- /dev/null +++ b/drivers/media/cec/core/Makefile @@ -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 diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/core/cec-adap.c similarity index 100% rename from drivers/media/cec/cec-adap.c rename to drivers/media/cec/core/cec-adap.c diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/core/cec-api.c similarity index 100% rename from drivers/media/cec/cec-api.c rename to drivers/media/cec/core/cec-api.c diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/core/cec-core.c similarity index 100% rename from drivers/media/cec/cec-core.c rename to drivers/media/cec/core/cec-core.c diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/core/cec-notifier.c similarity index 100% rename from drivers/media/cec/cec-notifier.c rename to drivers/media/cec/core/cec-notifier.c diff --git a/drivers/media/cec/cec-pin-error-inj.c b/drivers/media/cec/core/cec-pin-error-inj.c similarity index 100% rename from drivers/media/cec/cec-pin-error-inj.c rename to drivers/media/cec/core/cec-pin-error-inj.c diff --git a/drivers/media/cec/cec-pin-priv.h b/drivers/media/cec/core/cec-pin-priv.h similarity index 100% rename from drivers/media/cec/cec-pin-priv.h rename to drivers/media/cec/core/cec-pin-priv.h diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/core/cec-pin.c similarity index 100% rename from drivers/media/cec/cec-pin.c rename to drivers/media/cec/core/cec-pin.c diff --git a/drivers/media/cec/cec-priv.h b/drivers/media/cec/core/cec-priv.h similarity index 100% rename from drivers/media/cec/cec-priv.h rename to drivers/media/cec/core/cec-priv.h -- 2.11.0