diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-15 06:22:48 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 09:28:06 -0400 |
commit | 88dfe98c688e1700a4a9f73f8b7d570f4f52170d (patch) | |
tree | b6810766664731716c24138ac8a1c247602b77d8 /arch/arm/mach-pxa/pxa25x.c | |
parent | e176bb05fec4c00450302a75e81f8da3dc9e309e (diff) |
[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:
eb9289eb20df6b54214c45ac7c6bf5179a149026
9c372d06ce9ddf65e1393f9ea22a6d6bd5f96b42
e8c9c502690efd24b7055bf608e7a3c34216848b
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>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 8560439ba0b9..fe29c6e03a4f 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -106,18 +106,6 @@ EXPORT_SYMBOL(get_lcdclk_frequency_10khz); | |||
106 | 106 | ||
107 | #ifdef CONFIG_PM | 107 | #ifdef CONFIG_PM |
108 | 108 | ||
109 | int pxa_pm_prepare(suspend_state_t state) | ||
110 | { | ||
111 | switch (state) { | ||
112 | case PM_SUSPEND_MEM: | ||
113 | break; | ||
114 | default: | ||
115 | return -EINVAL; | ||
116 | } | ||
117 | |||
118 | return 0; | ||
119 | } | ||
120 | |||
121 | void pxa_cpu_pm_enter(suspend_state_t state) | 109 | void pxa_cpu_pm_enter(suspend_state_t state) |
122 | { | 110 | { |
123 | extern void pxa_cpu_suspend(unsigned int); | 111 | extern void pxa_cpu_suspend(unsigned int); |
@@ -135,7 +123,6 @@ void pxa_cpu_pm_enter(suspend_state_t state) | |||
135 | } | 123 | } |
136 | 124 | ||
137 | static struct pm_ops pxa25x_pm_ops = { | 125 | static struct pm_ops pxa25x_pm_ops = { |
138 | .prepare = pxa_pm_prepare, | ||
139 | .enter = pxa_pm_enter, | 126 | .enter = pxa_pm_enter, |
140 | .valid = pm_valid_only_mem, | 127 | .valid = pm_valid_only_mem, |
141 | }; | 128 | }; |