diff options
| author | Olof Johansson <olof@lixom.net> | 2011-09-08 17:54:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-10-13 14:08:28 -0700 |
| commit | 784278e116d6243f2588e28d2404425858df65b4 (patch) | |
| tree | 0564b6513d9b1d6655821fe9f35e41963c24b352 | |
| parent | b28fba2a4e631de99b25a9d4b2d1ba1c65f86f53 (diff) | |
| download | linux-784278e116d6243f2588e28d2404425858df65b4.tar.gz linux-784278e116d6243f2588e28d2404425858df65b4.tar.bz2 linux-784278e116d6243f2588e28d2404425858df65b4.zip | |
ARM: tegra: tegra_powergate_is_powered should be static
Not exported and not used externally.
Also, fix return type. Due to new return type, errors can't be returned
so WARN_ON instead of returning error if a bad parameter is specified.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/powergate.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/powergate.c | 5 |
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 @@ 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/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) 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; |