浏览代码

[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>
Hans Verkuil 8 年之前
父节点
当前提交
20249f8423
共有 3 个文件被更改,包括 3 次插入9 次删除
  1. 0 6
      drivers/media/cec/Kconfig
  2. 1 1
      drivers/media/cec/cec-adap.c
  3. 2 2
      drivers/media/cec/cec-core.c

+ 0 - 6
drivers/media/cec/Kconfig

@@ -3,9 +3,3 @@ config MEDIA_CEC_RC
 	depends on CEC_CORE && RC_CORE
 	depends on CEC_CORE && RC_CORE
 	---help---
 	---help---
 	  Pass on CEC remote control messages to the RC framework.
 	  Pass on CEC remote control messages to the RC framework.
-
-config MEDIA_CEC_DEBUG
-	bool "HDMI CEC debugfs interface"
-	depends on CEC_CORE && DEBUG_FS
-	---help---
-	  Turns on the DebugFS interface for CEC devices.

+ 1 - 1
drivers/media/cec/cec-adap.c

@@ -1864,7 +1864,7 @@ void cec_monitor_all_cnt_dec(struct cec_adapter *adap)
 		WARN_ON(call_op(adap, adap_monitor_all_enable, 0));
 		WARN_ON(call_op(adap, adap_monitor_all_enable, 0));
 }
 }
 
 
-#ifdef CONFIG_MEDIA_CEC_DEBUG
+#ifdef CONFIG_DEBUG_FS
 /*
 /*
  * Log the current state of the CEC adapter.
  * Log the current state of the CEC adapter.
  * Very useful for debugging.
  * Very useful for debugging.

+ 2 - 2
drivers/media/cec/cec-core.c

@@ -323,7 +323,7 @@ int cec_register_adapter(struct cec_adapter *adap,
 	}
 	}
 
 
 	dev_set_drvdata(&adap->devnode.dev, adap);
 	dev_set_drvdata(&adap->devnode.dev, adap);
-#ifdef CONFIG_MEDIA_CEC_DEBUG
+#ifdef CONFIG_DEBUG_FS
 	if (!top_cec_dir)
 	if (!top_cec_dir)
 		return 0;
 		return 0;
 
 
@@ -395,7 +395,7 @@ static int __init cec_devnode_init(void)
 		return ret;
 		return ret;
 	}
 	}
 
 
-#ifdef CONFIG_MEDIA_CEC_DEBUG
+#ifdef CONFIG_DEBUG_FS
 	top_cec_dir = debugfs_create_dir("cec", NULL);
 	top_cec_dir = debugfs_create_dir("cec", NULL);
 	if (IS_ERR_OR_NULL(top_cec_dir)) {
 	if (IS_ERR_OR_NULL(top_cec_dir)) {
 		pr_warn("cec: Failed to create debugfs cec dir\n");
 		pr_warn("cec: Failed to create debugfs cec dir\n");