mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[ARM] pxa: Fix PXA27x suspend type validation, remove pxa_pm_prepare()
pxa_pm_prepare() tried to validate the suspend method type. As noted in previous commits:eb9289eb20
9c372d06ce
e8c9c50269
the checking of the suspend type in the 'prepare' method is the wrong place to do this; use the 'valid' method instead. This means that pxa_pm_prepare() can be entirely removed. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
e176bb05fe
commit
88dfe98c68
3 changed files with 6 additions and 27 deletions
|
@ -766,7 +766,6 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
|
|||
}
|
||||
|
||||
static struct pm_ops sharpsl_pm_ops = {
|
||||
.prepare = pxa_pm_prepare,
|
||||
.enter = corgi_pxa_pm_enter,
|
||||
.valid = pm_valid_only_mem,
|
||||
};
|
||||
|
|
|
@ -106,18 +106,6 @@ EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
|
|||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
int pxa_pm_prepare(suspend_state_t state)
|
||||
{
|
||||
switch (state) {
|
||||
case PM_SUSPEND_MEM:
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void pxa_cpu_pm_enter(suspend_state_t state)
|
||||
{
|
||||
extern void pxa_cpu_suspend(unsigned int);
|
||||
|
@ -135,7 +123,6 @@ void pxa_cpu_pm_enter(suspend_state_t state)
|
|||
}
|
||||
|
||||
static struct pm_ops pxa25x_pm_ops = {
|
||||
.prepare = pxa_pm_prepare,
|
||||
.enter = pxa_pm_enter,
|
||||
.valid = pm_valid_only_mem,
|
||||
};
|
||||
|
|
|
@ -123,17 +123,6 @@ EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
|
|||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
int pxa_pm_prepare(suspend_state_t state)
|
||||
{
|
||||
switch (state) {
|
||||
case PM_SUSPEND_MEM:
|
||||
case PM_SUSPEND_STANDBY:
|
||||
return 0;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
void pxa_cpu_pm_enter(suspend_state_t state)
|
||||
{
|
||||
extern void pxa_cpu_standby(void);
|
||||
|
@ -163,10 +152,14 @@ void pxa_cpu_pm_enter(suspend_state_t state)
|
|||
}
|
||||
}
|
||||
|
||||
static int pxa27x_pm_valid(suspend_state_t state)
|
||||
{
|
||||
return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
|
||||
}
|
||||
|
||||
static struct pm_ops pxa27x_pm_ops = {
|
||||
.prepare = pxa_pm_prepare,
|
||||
.enter = pxa_pm_enter,
|
||||
.valid = pm_valid_only_mem,
|
||||
.valid = pxa27x_pm_valid,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue