hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2017-05-28 05:58:04 -03:00 committed by Mauro Carvalho Chehab
parent 9177e51d14
commit e94c32818d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/Kconfig
View File

@ -5,7 +5,7 @@
config CEC_CORE config CEC_CORE
tristate tristate
config MEDIA_CEC_NOTIFIER config CEC_NOTIFIER
bool bool
menuconfig MEDIA_SUPPORT menuconfig MEDIA_SUPPORT

2
drivers/media/cec/Makefile
View File

@ -1,6 +1,6 @@
cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o 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 cec-objs += cec-notifier.o
endif endif

4
drivers/media/cec/cec-core.c
View File

@ -187,7 +187,7 @@ static void cec_devnode_unregister(struct cec_devnode *devnode)
put_device(&devnode->dev); put_device(&devnode->dev);
} }
#ifdef CONFIG_MEDIA_CEC_NOTIFIER #ifdef CONFIG_CEC_NOTIFIER
static void cec_cec_notify(struct cec_adapter *adap, u16 pa) static void cec_cec_notify(struct cec_adapter *adap, u16 pa)
{ {
cec_s_phys_addr(adap, pa, false); cec_s_phys_addr(adap, pa, false);
@ -355,7 +355,7 @@ void cec_unregister_adapter(struct cec_adapter *adap)
adap->rc = NULL; adap->rc = NULL;
#endif #endif
debugfs_remove_recursive(adap->cec_dir); debugfs_remove_recursive(adap->cec_dir);
#ifdef CONFIG_MEDIA_CEC_NOTIFIER #ifdef CONFIG_CEC_NOTIFIER
if (adap->notifier) if (adap->notifier)
cec_notifier_unregister(adap->notifier); cec_notifier_unregister(adap->notifier);
#endif #endif

4
drivers/media/platform/Kconfig
View File

@ -503,7 +503,7 @@ config VIDEO_SAMSUNG_S5P_CEC
tristate "Samsung S5P CEC driver" tristate "Samsung S5P CEC driver"
depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
select CEC_CORE select CEC_CORE
select MEDIA_CEC_NOTIFIER select CEC_NOTIFIER
---help--- ---help---
This is a driver for Samsung S5P HDMI CEC interface. It uses the This is a driver for Samsung S5P HDMI CEC interface. It uses the
generic CEC framework interface. generic CEC framework interface.
@ -514,7 +514,7 @@ config VIDEO_STI_HDMI_CEC
tristate "STMicroelectronics STiH4xx HDMI CEC driver" tristate "STMicroelectronics STiH4xx HDMI CEC driver"
depends on ARCH_STI || COMPILE_TEST depends on ARCH_STI || COMPILE_TEST
select CEC_CORE select CEC_CORE
select MEDIA_CEC_NOTIFIER select CEC_NOTIFIER
---help--- ---help---
This is a driver for STIH4xx HDMI CEC interface. It uses the This is a driver for STIH4xx HDMI CEC interface. It uses the
generic CEC framework interface. generic CEC framework interface.

2
include/media/cec-notifier.h
View File

@ -29,7 +29,7 @@ struct edid;
struct cec_adapter; struct cec_adapter;
struct cec_notifier; 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. * cec_notifier_get - find or create a new cec_notifier for the given device.

4
include/media/cec.h
View File

@ -173,7 +173,7 @@ struct cec_adapter {
bool passthrough; bool passthrough;
struct cec_log_addrs log_addrs; struct cec_log_addrs log_addrs;
#ifdef CONFIG_MEDIA_CEC_NOTIFIER #ifdef CONFIG_CEC_NOTIFIER
struct cec_notifier *notifier; struct cec_notifier *notifier;
#endif #endif
@ -300,7 +300,7 @@ u16 cec_phys_addr_for_input(u16 phys_addr, u8 input);
*/ */
int cec_phys_addr_validate(u16 phys_addr, u16 *parent, u16 *port); int cec_phys_addr_validate(u16 phys_addr, u16 *parent, u16 *port);
#ifdef CONFIG_MEDIA_CEC_NOTIFIER #ifdef CONFIG_CEC_NOTIFIER
void cec_register_cec_notifier(struct cec_adapter *adap, void cec_register_cec_notifier(struct cec_adapter *adap,
struct cec_notifier *notifier); struct cec_notifier *notifier);
#endif #endif