summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-15 11:03:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-12 14:27:53 +0100
commitf62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14 (patch)
treecddad98c3e62817e4899e5349ea7b8566f4f5e04 /arch
parent7dcca30a32aadb0520417521b0c44f42d09fe05c (diff)
downloadlinux-stable-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.tar.gz
linux-stable-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.tar.bz2
linux-stable-f62c3f2c35874713ebbb6b6a4b9d9c6caaed4f14.zip
[ARM] pxa: remove useless pxa_pm_finish() function
pxa_pm_finish() does nothing but return zero. The core code does nothing with this return value, and will not try to call the finish method in the pm_ops structure if it is NULL. Therefore, we can remove this useless function. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/common/sharpsl_pm.c1
-rw-r--r--arch/arm/mach-pxa/pm.c11
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index 3bf3a927ae22..62cb50816cc6 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -768,7 +768,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,
- .finish = pxa_pm_finish,
.valid = pm_valid_only_mem,
};
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 6bf15ae73848..6d86203aef7b 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -213,20 +213,9 @@ int pxa_pm_prepare(suspend_state_t state)
EXPORT_SYMBOL_GPL(pxa_pm_prepare);
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-int pxa_pm_finish(suspend_state_t state)
-{
- return 0;
-}
-
-EXPORT_SYMBOL_GPL(pxa_pm_finish);
-
static struct pm_ops pxa_pm_ops = {
.prepare = pxa_pm_prepare,
.enter = pxa_pm_enter,
- .finish = pxa_pm_finish,
.valid = pm_valid_only_mem,
};