Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...

[pandora-kernel.git] / arch / arm / mach-tegra / powergate.c

diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 3cee9aa..9483064 100644 (file)
--- 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;