clk: remove CONFIG_COMMON_CLK_DEBUG

Populate ${DEBUGS_MOUNT_POINT}/clk if CONFIG_DEBUG_FS is set. This
eliminates the extra (annoying) step of enabling the config option
manually.

Signed-off-by: Mike Turquette <mturquette@linaro.org>

3 files changed, 2 insertions, 12 deletions

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 3089f05ba661..407cffb04895 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -23,16 +23,6 @@ config COMMON_CLK
 menu "Common Clock Framework"
         depends on COMMON_CLK
 
-config COMMON_CLK_DEBUG
-        bool "DebugFS representation of clock tree"
-        select DEBUG_FS
-        ---help---
-          Creates a directory hierarchy in debugfs for visualizing the clk
-          tree structure.  Each directory contains read-only members
-          that export information specific to that clk node: clk_rate,
-          clk_flags, clk_prepare_count, clk_enable_count &
-          clk_notifier_count.
-
 config COMMON_CLK_WM831X
         tristate "Clock driver for WM831x/2x PMICs"
         depends on MFD_WM831X
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index fbe08f618d59..b7f6e99e61eb 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -92,7 +92,7 @@ static void clk_enable_unlock(unsigned long flags)
 
 /***        debugfs support        ***/
 
-#ifdef CONFIG_COMMON_CLK_DEBUG
+#ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 
 static struct dentry *rootdir;
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index accb517e77e9..5fb086b06c83 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -45,7 +45,7 @@ struct clk {
         struct hlist_head       children;
         struct hlist_node       child_node;
         unsigned int            notifier_count;
-#ifdef CONFIG_COMMON_CLK_DEBUG
+#ifdef CONFIG_DEBUG_FS
         struct dentry           *dentry;
 #endif
 };