diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-05-28 04:52:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-04 14:23:36 -0400 |
commit | 20249f84238e006ef7b726d3211a70de7454d045 (patch) | |
tree | 77f8fb3f901a03dd63779705c54419c1e4bf1fac | |
parent | e94c32818d865b620c9bbd2656ab3199259ef9ec (diff) |
[media] cec: drop MEDIA_CEC_DEBUG
Just depend on DEBUG_FS, no need to invent a new kernel config.
Especially since CEC can be enabled by drm without enabling
MEDIA_SUPPORT.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r-- | drivers/media/cec/Kconfig | 6 | ||||
-rw-r--r-- | drivers/media/cec/cec-adap.c | 2 | ||||
-rw-r--r-- | drivers/media/cec/cec-core.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig index b7d876b384f6..4e25a950ae6f 100644 --- a/drivers/media/cec/Kconfig +++ b/drivers/media/cec/Kconfig | |||
@@ -3,9 +3,3 @@ config MEDIA_CEC_RC | |||
3 | depends on CEC_CORE && RC_CORE | 3 | depends on CEC_CORE && RC_CORE |
4 | ---help--- | 4 | ---help--- |
5 | Pass on CEC remote control messages to the RC framework. | 5 | Pass on CEC remote control messages to the RC framework. |
6 | |||
7 | config MEDIA_CEC_DEBUG | ||
8 | bool "HDMI CEC debugfs interface" | ||
9 | depends on CEC_CORE && DEBUG_FS | ||
10 | ---help--- | ||
11 | Turns on the DebugFS interface for CEC devices. | ||
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c index f5fe01c9da8a..9dfc79800c71 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c | |||
@@ -1864,7 +1864,7 @@ void cec_monitor_all_cnt_dec(struct cec_adapter *adap) | |||
1864 | WARN_ON(call_op(adap, adap_monitor_all_enable, 0)); | 1864 | WARN_ON(call_op(adap, adap_monitor_all_enable, 0)); |
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | #ifdef CONFIG_MEDIA_CEC_DEBUG | 1867 | #ifdef CONFIG_DEBUG_FS |
1868 | /* | 1868 | /* |
1869 | * Log the current state of the CEC adapter. | 1869 | * Log the current state of the CEC adapter. |
1870 | * Very useful for debugging. | 1870 | * Very useful for debugging. |
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c index feeb4c5afa69..2f87748ba4fc 100644 --- a/drivers/media/cec/cec-core.c +++ b/drivers/media/cec/cec-core.c | |||
@@ -323,7 +323,7 @@ int cec_register_adapter(struct cec_adapter *adap, | |||
323 | } | 323 | } |
324 | 324 | ||
325 | dev_set_drvdata(&adap->devnode.dev, adap); | 325 | dev_set_drvdata(&adap->devnode.dev, adap); |
326 | #ifdef CONFIG_MEDIA_CEC_DEBUG | 326 | #ifdef CONFIG_DEBUG_FS |
327 | if (!top_cec_dir) | 327 | if (!top_cec_dir) |
328 | return 0; | 328 | return 0; |
329 | 329 | ||
@@ -395,7 +395,7 @@ static int __init cec_devnode_init(void) | |||
395 | return ret; | 395 | return ret; |
396 | } | 396 | } |
397 | 397 | ||
398 | #ifdef CONFIG_MEDIA_CEC_DEBUG | 398 | #ifdef CONFIG_DEBUG_FS |
399 | top_cec_dir = debugfs_create_dir("cec", NULL); | 399 | top_cec_dir = debugfs_create_dir("cec", NULL); |
400 | if (IS_ERR_OR_NULL(top_cec_dir)) { | 400 | if (IS_ERR_OR_NULL(top_cec_dir)) { |
401 | pr_warn("cec: Failed to create debugfs cec dir\n"); | 401 | pr_warn("cec: Failed to create debugfs cec dir\n"); |