aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-02-21 02:35:07 -0500
committerColin Cross <ccross@android.com>2011-02-21 03:10:46 -0500
commit4db4afb4df93425708ca19417921bcc6a6306476 (patch)
treed7b8fa3dd85d7b9407329f02fa07ba366b491293 /arch
parent310992ca4b994db8c869e1c0f32c004b7a196147 (diff)
ARM: tegra: clock: Minor cleanups
Remove unnecessary uses of #ifdef CONFIG_DEBUG_FS Convert bool assignments from 1 to true Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/clock.c6
-rw-r--r--arch/arm/mach-tegra/clock.h2
-rw-r--r--arch/arm/mach-tegra/tegra2_clocks.c2
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index aff4c5b8c37..f1f9c6d36bd 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -135,7 +135,7 @@ void clk_init(struct clk *c)
135 135
136 if (!c->ops || !c->ops->enable) { 136 if (!c->ops || !c->ops->enable) {
137 c->refcnt++; 137 c->refcnt++;
138 c->set = 1; 138 c->set = true;
139 if (c->parent) 139 if (c->parent)
140 c->state = c->parent->state; 140 c->state = c->parent->state;
141 else 141 else
@@ -169,9 +169,7 @@ int clk_enable(struct clk *c)
169 goto out; 169 goto out;
170 } 170 }
171 c->state = ON; 171 c->state = ON;
172#ifdef CONFIG_DEBUG_FS 172 c->set = true;
173 c->set = 1;
174#endif
175 } 173 }
176 } 174 }
177 c->refcnt++; 175 c->refcnt++;
diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h
index bb755c28a50..ebe6ea8b057 100644
--- a/arch/arm/mach-tegra/clock.h
+++ b/arch/arm/mach-tegra/clock.h
@@ -80,8 +80,8 @@ struct clk {
80 80
81#ifdef CONFIG_DEBUG_FS 81#ifdef CONFIG_DEBUG_FS
82 struct dentry *dent; 82 struct dentry *dent;
83 bool set;
84#endif 83#endif
84 bool set;
85 struct clk_ops *ops; 85 struct clk_ops *ops;
86 unsigned long rate; 86 unsigned long rate;
87 unsigned long max_rate; 87 unsigned long max_rate;
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 1e414ba6df4..f6f685c4f33 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -1218,9 +1218,7 @@ static void tegra_clk_shared_bus_init(struct clk *c)
1218 c->max_rate = c->parent->max_rate; 1218 c->max_rate = c->parent->max_rate;
1219 c->u.shared_bus_user.rate = c->parent->max_rate; 1219 c->u.shared_bus_user.rate = c->parent->max_rate;
1220 c->state = OFF; 1220 c->state = OFF;
1221#ifdef CONFIG_DEBUG_FS
1222 c->set = true; 1221 c->set = true;
1223#endif
1224 1222
1225 spin_lock_irqsave(&c->parent->spinlock, flags); 1223 spin_lock_irqsave(&c->parent->spinlock, flags);
1226 1224