From 0131bb610247054f533d5ddbc162a3bd31c68c9b Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 8 Sep 2011 17:54:21 -0700 Subject: [PATCH] --- yaml --- r: 272640 b: refs/heads/master c: 784278e116d6243f2588e28d2404425858df65b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/include/mach/powergate.h | 1 - trunk/arch/arm/mach-tegra/powergate.c | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e75fc13d7e15..f661ed613ff8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b28fba2a4e631de99b25a9d4b2d1ba1c65f86f53 +refs/heads/master: 784278e116d6243f2588e28d2404425858df65b4 diff --git a/trunk/arch/arm/mach-tegra/include/mach/powergate.h b/trunk/arch/arm/mach-tegra/include/mach/powergate.h index 401d1b725291..39c396d2ddb0 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/powergate.h +++ b/trunk/arch/arm/mach-tegra/include/mach/powergate.h @@ -31,7 +31,6 @@ int tegra_powergate_power_on(int id); int tegra_powergate_power_off(int id); -bool tegra_powergate_is_powered(int id); int tegra_powergate_remove_clamping(int id); /* Must be called with clk disabled, and returns with clk enabled */ diff --git a/trunk/arch/arm/mach-tegra/powergate.c b/trunk/arch/arm/mach-tegra/powergate.c index 3cee9aa1f2c8..948306491a59 100644 --- a/trunk/arch/arm/mach-tegra/powergate.c +++ b/trunk/arch/arm/mach-tegra/powergate.c @@ -89,12 +89,11 @@ int tegra_powergate_power_off(int id) return tegra_powergate_set(id, false); } -bool tegra_powergate_is_powered(int id) +static bool tegra_powergate_is_powered(int id) { u32 status; - if (id < 0 || id >= TEGRA_NUM_POWERGATE) - return -EINVAL; + WARN_ON(id < 0 || id >= TEGRA_NUM_POWERGATE); status = pmc_read(PWRGATE_STATUS) & (1 << id); return !!status;