rk2928/rk30xx: disable dvfs tree debug and avs debug, same Macro as /proc/clocks

diff --git a/arch/arm/mach-rk2928/dvfs.c b/arch/arm/mach-rk2928/dvfs.c
index acdf8502420e565ed088f2e04fdb46716e48df3d..d9c27df6421c581b4118d9b7c101bfb3ee297acf 100644 (file)
--- a/arch/arm/mach-rk2928/dvfs.c
+++ b/arch/arm/mach-rk2928/dvfs.c
@@ -1869,10 +1869,12 @@ struct dvfs_attribute {
 \r
 static struct dvfs_attribute dvfs_attrs[] = {\r
        /*     node_name        permision               show_func       store_func */\r
+#ifdef CONFIG_RK_CLOCK_PROC\r
        __ATTR(dvfs_tree,       S_IRUGO | S_IWUSR,      dvfs_tree_show, dvfs_tree_store),\r
-       __ATTR(avs_init,        S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
+       //__ATTR(avs_init,      S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
        //__ATTR(avs_dyn,               S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
-       __ATTR(avs_now,         S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
+       //__ATTR(avs_now,               S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
+#endif\r
 };\r
 \r
 static int __init dvfs_init(void)\r

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index b47ca9df06d3d43770c73114ed7c61213499146b..4cacf70b8095ba36da6c7c190a9ca8983d81ec0d 100755 (executable)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -267,7 +267,7 @@ void dvfs_clk_register_set_rate_callback(struct clk *clk, clk_dvfs_target_callba
        struct clk_node *dvfs_clk = clk_get_dvfs_info(clk);\r
        if (IS_ERR_OR_NULL(dvfs_clk)){\r
                DVFS_ERR("%s %s get dvfs_clk err\n", __func__, clk->name);\r
-               return -1;\r
+               return ;\r
        }\r
        dvfs_clk->clk_dvfs_target = clk_dvfs_target;\r
 }\r
@@ -1865,10 +1865,12 @@ struct dvfs_attribute {
 \r
 static struct dvfs_attribute dvfs_attrs[] = {\r
        /*     node_name        permision               show_func       store_func */\r
+#ifdef CONFIG_RK_CLOCK_PROC\r
        __ATTR(dvfs_tree,       S_IRUGO | S_IWUSR,      dvfs_tree_show, dvfs_tree_store),\r
-       __ATTR(avs_init,        S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
+       //__ATTR(avs_init,      S_IRUGO | S_IWUSR,      avs_init_show,  avs_init_store),\r
        //__ATTR(avs_dyn,               S_IRUGO | S_IWUSR,      avs_dyn_show,   avs_dyn_store),\r
-       __ATTR(avs_now,         S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
+       //__ATTR(avs_now,               S_IRUGO | S_IWUSR,      avs_now_show,   avs_now_store),\r
+#endif\r
 };\r
 \r
 static int __init dvfs_init(void)\r