From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Sun, 30 Oct 2005 23:00:00 +0000 (-0800)
Subject: [PATCH] swsusp: get rid of unnecessary wrapper function
X-Git-Tag: v2.6.15-rc1~59^2~15^2~141
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=2e32a43efdc8175579cc91e8b620ac331376a437;p=powerpc.git

[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 72787f9256..42a6287043 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();
-}