[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>

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 72787f9..42a6287 100644 (file)
--- 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();
-}