From: Colin Cross <ccross@android.com>
Date: Mon, 25 Oct 2010 21:15:44 +0000 (-0700)
Subject: ARM: tegra: clock: Remove dependency between "set" and debugfs
X-Git-Tag: firefly_0821_release~9833^2~142^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f729366c1750362c015649f90dbde555a4cdda03;p=firefly-linux-kernel-4.4.55.git

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 09b5993c5513..d34f0efbdd37 100644
--- 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 eb443acb5e1c..b13aab47083e 100644
--- 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 835af3a7a782..c270457926a9 100644
--- 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);