ARM: tegra: clock: Remove dependency between "set" and debugfs

Change-Id: I732f9428096d057e08092120c6f8c2890230a242

diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 09b5993c55136af44251ec1e419e1ea054108296..d34f0efbdd379abb720cba4b5621dd2fc88019d9 100644 (file)
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -138,7 +138,7 @@ void clk_init(struct clk *c)
 
        if (!c->ops || !c->ops->enable) {
                c->refcnt++;
-               c->set = 1;
+               c->set = true;
                if (c->parent)
                        c->state = c->parent->state;
                else
@@ -174,9 +174,7 @@ int clk_enable_locked(struct clk *c)
                                return ret;
                        }
                        c->state = ON;
-#ifdef CONFIG_DEBUG_FS
-                       c->set = 1;
-#endif
+                       c->set = true;
                }
        }
        c->refcnt++;

diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h
index eb443acb5e1c17157caade007e4d184218766bdc..b13aab47083e40bc571de996efe1ea096b52b466 100644 (file)
--- a/arch/arm/mach-tegra/clock.h
+++ b/arch/arm/mach-tegra/clock.h
@@ -83,8 +83,8 @@ struct clk {
 #ifdef CONFIG_DEBUG_FS
        struct dentry           *dent;
        struct dentry           *parent_dent;
-       bool                    set;
 #endif
+       bool                    set;
        struct clk_ops          *ops;
        unsigned long           dvfs_rate;
        unsigned long           rate;

diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 835af3a7a782bc945b71e0c95c30acc3131b6d5c..c270457926a96b36697c97d3cd8c737b8288d4de 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -1167,9 +1167,7 @@ static void tegra_clk_shared_bus_init(struct clk *c)
        c->max_rate = c->parent->max_rate;
        c->u.shared_bus_user.rate = c->parent->max_rate;
        c->state = OFF;
-#ifdef CONFIG_DEBUG_FS
-       c->set = 1;
-#endif
+       c->set = true;
 
        list_add_tail(&c->u.shared_bus_user.node,
                &c->parent->u.shared_bus.list);