summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-02-20 23:35:07 -0800
committerColin Cross <ccross@android.com>2011-02-21 00:10:46 -0800
commit4db4afb4df93425708ca19417921bcc6a6306476 (patch)
treed7b8fa3dd85d7b9407329f02fa07ba366b491293
parent310992ca4b994db8c869e1c0f32c004b7a196147 (diff)
downloadlinux-4db4afb4df93425708ca19417921bcc6a6306476.tar.bz2
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>
-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 aff4c5b8c378..f1f9c6d36bd2 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)
if (!c->ops || !c->ops->enable) {
c->refcnt++;
- c->set = 1;
+ c->set = true;
if (c->parent)
c->state = c->parent->state;
else
@@ -169,9 +169,7 @@ int clk_enable(struct clk *c)
goto out;
}
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 bb755c28a509..ebe6ea8b0575 100644
--- a/arch/arm/mach-tegra/clock.h
+++ b/arch/arm/mach-tegra/clock.h
@@ -80,8 +80,8 @@ struct clk {
#ifdef CONFIG_DEBUG_FS
struct dentry *dent;
- bool set;
#endif
+ bool set;
struct clk_ops *ops;
unsigned long rate;
unsigned long max_rate;
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 1e414ba6df4b..f6f685c4f339 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)
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 = true;
-#endif
spin_lock_irqsave(&c->parent->spinlock, flags);