diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2012-01-20 14:27:05 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-01-30 12:17:48 -0800 |
| commit | baecba8e25a429af4b315d06bdc53ef58393eb7f (patch) | |
| tree | be7b2ae85545d373b7ea966355883ab85ed53cdb /arch/arm/mach-tegra/pm.c | |
| parent | fe725c36ff904f2693031b8f14b5849906c2c271 (diff) | |
ARM: tegra: power: Fix warnings when PM_SLEEP is not selected
Reviewed-on: http://git-master/r/76686
Change-Id: I88939c92aa1c28f5177010ba2afd524c3a4b713d
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/77738
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/pm.c')
| -rw-r--r-- | arch/arm/mach-tegra/pm.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index edcb28304d41..ca355c4ec42a 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -173,13 +173,6 @@ static struct clk *tegra_pclk; static const struct tegra_suspend_platform_data *pdata; static enum tegra_suspend_mode current_suspend_mode = TEGRA_SUSPEND_NONE; -static const char *tegra_suspend_name[TEGRA_MAX_SUSPEND_MODE] = { - [TEGRA_SUSPEND_NONE] = "none", - [TEGRA_SUSPEND_LP2] = "lp2", - [TEGRA_SUSPEND_LP1] = "lp1", - [TEGRA_SUSPEND_LP0] = "lp0", -}; - #if defined(CONFIG_TEGRA_CLUSTER_CONTROL) && INSTRUMENT_CLUSTER_SWITCH enum tegra_cluster_switch_time_id { tegra_cluster_switch_time_id_start = 0, @@ -209,6 +202,13 @@ static unsigned long #endif #ifdef CONFIG_PM_SLEEP +static const char *tegra_suspend_name[TEGRA_MAX_SUSPEND_MODE] = { + [TEGRA_SUSPEND_NONE] = "none", + [TEGRA_SUSPEND_LP2] = "lp2", + [TEGRA_SUSPEND_LP1] = "lp1", + [TEGRA_SUSPEND_LP0] = "lp0", +}; + unsigned long tegra_cpu_power_good_time(void) { if (WARN_ON_ONCE(!pdata)) @@ -967,9 +967,7 @@ static struct kobj_attribute suspend_mode_attribute = __ATTR(mode, 0644, suspend_mode_show, suspend_mode_store); static struct kobject *suspend_kobj; -#endif -#ifdef CONFIG_PM_SLEEP static int tegra_pm_enter_suspend(void) { pr_info("Entering suspend state %s\n", lp_state[current_suspend_mode]); |