Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94c3281 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER 



This config option is strictly speaking independent of the
media subsystem since it can be used by drm as well.

Besides, it looks odd when drivers select CEC_CORE and
MEDIA_CEC_NOTIFIER, that's inconsistent naming.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 9177e51d

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
config CEC_CORE

	tristate



config MEDIA_CEC_NOTIFIER

config CEC_NOTIFIER

	bool



menuconfig MEDIA_SUPPORT

drivers/media/cec/Makefile

+1 −1
Original line number Diff line number Diff line 
cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o



ifeq ($(CONFIG_MEDIA_CEC_NOTIFIER),y)

ifeq ($(CONFIG_CEC_NOTIFIER),y)

  cec-objs += cec-notifier.o

endif

drivers/media/cec/cec-core.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void cec_devnode_unregister(struct cec_devnode *devnode) 
	put_device(&devnode->dev);

}



#ifdef CONFIG_MEDIA_CEC_NOTIFIER

#ifdef CONFIG_CEC_NOTIFIER

static void cec_cec_notify(struct cec_adapter *adap, u16 pa)

{

	cec_s_phys_addr(adap, pa, false);
@@ -355,7 +355,7 @@ void cec_unregister_adapter(struct cec_adapter *adap) 
	adap->rc = NULL;

#endif

	debugfs_remove_recursive(adap->cec_dir);

#ifdef CONFIG_MEDIA_CEC_NOTIFIER

#ifdef CONFIG_CEC_NOTIFIER

	if (adap->notifier)

		cec_notifier_unregister(adap->notifier);

#endif

drivers/media/platform/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ config VIDEO_SAMSUNG_S5P_CEC 
       tristate "Samsung S5P CEC driver"

       depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST

       select CEC_CORE

       select MEDIA_CEC_NOTIFIER

       select CEC_NOTIFIER

       ---help---

         This is a driver for Samsung S5P HDMI CEC interface. It uses the

         generic CEC framework interface.
@@ -514,7 +514,7 @@ config VIDEO_STI_HDMI_CEC 
       tristate "STMicroelectronics STiH4xx HDMI CEC driver"

       depends on ARCH_STI || COMPILE_TEST

       select CEC_CORE

       select MEDIA_CEC_NOTIFIER

       select CEC_NOTIFIER

       ---help---

         This is a driver for STIH4xx HDMI CEC interface. It uses the

         generic CEC framework interface.

include/media/cec-notifier.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct edid; 
struct cec_adapter;

struct cec_notifier;



#ifdef CONFIG_MEDIA_CEC_NOTIFIER

#if IS_REACHABLE(CONFIG_CEC_CORE) && IS_ENABLED(CONFIG_CEC_NOTIFIER)



/**

 * cec_notifier_get - find or create a new cec_notifier for the given device.