aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/include/mach/powergate.h1
-rw-r--r--arch/arm/mach-tegra/powergate.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/include/mach/powergate.h b/arch/arm/mach-tegra/include/mach/powergate.h
index 401d1b725291..39c396d2ddb0 100644
--- a/arch/arm/mach-tegra/include/mach/powergate.h
+++ b/arch/arm/mach-tegra/include/mach/powergate.h
@@ -31,7 +31,6 @@
31 31
32int tegra_powergate_power_on(int id); 32int tegra_powergate_power_on(int id);
33int tegra_powergate_power_off(int id); 33int tegra_powergate_power_off(int id);
34bool tegra_powergate_is_powered(int id);
35int tegra_powergate_remove_clamping(int id); 34int tegra_powergate_remove_clamping(int id);
36 35
37/* Must be called with clk disabled, and returns with clk enabled */ 36/* Must be called with clk disabled, and returns with clk enabled */
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 3cee9aa1f2c8..948306491a59 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -89,12 +89,11 @@ int tegra_powergate_power_off(int id)
89 return tegra_powergate_set(id, false); 89 return tegra_powergate_set(id, false);
90} 90}
91 91
92bool tegra_powergate_is_powered(int id) 92static bool tegra_powergate_is_powered(int id)
93{ 93{
94 u32 status; 94 u32 status;
95 95
96 if (id < 0 || id >= TEGRA_NUM_POWERGATE) 96 WARN_ON(id < 0 || id >= TEGRA_NUM_POWERGATE);
97 return -EINVAL;
98 97
99 status = pmc_read(PWRGATE_STATUS) & (1 << id); 98 status = pmc_read(PWRGATE_STATUS) & (1 << id);
100 return !!status; 99 return !!status;