diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2005-10-30 18:00:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:15 -0500 |
commit | 2e32a43efdc8175579cc91e8b620ac331376a437 (patch) | |
tree | fd46c6cf28d437fc53acc72cff03d2d796d834ff /kernel/power/snapshot.c | |
parent | de491861e1457c31aed6d44d96afb549365ff790 (diff) |
[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/snapshot.c')
-rw-r--r-- | kernel/power/snapshot.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 72787f925630..42a628704398 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
@@ -378,7 +378,7 @@ static struct pbe *swsusp_alloc(unsigned nr_pages) | |||
378 | return pblist; | 378 | return pblist; |
379 | } | 379 | } |
380 | 380 | ||
381 | static int suspend_prepare_image(void) | 381 | asmlinkage int swsusp_save(void) |
382 | { | 382 | { |
383 | unsigned nr_pages; | 383 | unsigned nr_pages; |
384 | 384 | ||
@@ -433,9 +433,3 @@ static int suspend_prepare_image(void) | |||
433 | printk("swsusp: critical section/: done (%d pages copied)\n", nr_pages); | 433 | printk("swsusp: critical section/: done (%d pages copied)\n", nr_pages); |
434 | return 0; | 434 | return 0; |
435 | } | 435 | } |
436 | |||
437 | |||
438 | asmlinkage int swsusp_save(void) | ||
439 | { | ||
440 | return suspend_prepare_image(); | ||
441 | } | ||