aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2005-10-30 15:00:00 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:15 -0800
commit2e32a43efdc8175579cc91e8b620ac331376a437 (patch)
treefd46c6cf28d437fc53acc72cff03d2d796d834ff /kernel/power
parentde491861e1457c31aed6d44d96afb549365ff790 (diff)
downloadkernel_samsung_aries-2e32a43efdc8175579cc91e8b620ac331376a437.zip
kernel_samsung_aries-2e32a43efdc8175579cc91e8b620ac331376a437.tar.gz
kernel_samsung_aries-2e32a43efdc8175579cc91e8b620ac331376a437.tar.bz2
[PATCH] swsusp: get rid of unnecessary wrapper function
The following patch merges two functions in a trivial way. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/snapshot.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 72787f9..42a6287 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -378,7 +378,7 @@ static struct pbe *swsusp_alloc(unsigned nr_pages)
return pblist;
}
-static int suspend_prepare_image(void)
+asmlinkage int swsusp_save(void)
{
unsigned nr_pages;
@@ -433,9 +433,3 @@ static int suspend_prepare_image(void)
printk("swsusp: critical section/: done (%d pages copied)\n", nr_pages);
return 0;
}
-
-
-asmlinkage int swsusp_save(void)
-{
- return suspend_prepare_image();
-}