Hibernation: Move low level resume to disk.c

[linux-2.6-omap-h63xx.git] / kernel / power / swsusp.c

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 5da304c8f1f66473233d68d713a66e2a17c59d54..dc29a20aff4107990b549a33193a22de46dc5c7f 100644 (file)
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 1024;
 
 int in_suspend __nosavedata = 0;
 
-#ifdef CONFIG_HIGHMEM
-unsigned int count_highmem_pages(void);
-int restore_highmem(void);
-#else
-static inline int restore_highmem(void) { return 0; }
-static inline unsigned int count_highmem_pages(void) { return 0; }
-#endif
-
 /**
  *     The following functions are used for tracing the allocated
  *     swap pages, so that they can be freed in case of an error.
@@ -269,71 +261,3 @@ int swsusp_shrink_memory(void)
 
        return 0;
 }
-
-int swsusp_suspend(void)
-{
-       int error;
-
-       if ((error = arch_prepare_suspend()))
-               return error;
-
-       local_irq_disable();
-       /* At this point, device_suspend() has been called, but *not*
-        * device_power_down(). We *must* device_power_down() now.
-        * Otherwise, drivers for some devices (e.g. interrupt controllers)
-        * become desynchronized with the actual state of the hardware
-        * at resume time, and evil weirdness ensues.
-        */
-       if ((error = device_power_down(PMSG_FREEZE))) {
-               printk(KERN_ERR "Some devices failed to power down, aborting suspend\n");
-               goto Enable_irqs;
-       }
-
-       save_processor_state();
-       if ((error = swsusp_arch_suspend()))
-               printk(KERN_ERR "Error %d suspending\n", error);
-       /* Restore control flow magically appears here */
-       restore_processor_state();
-       /* NOTE:  device_power_up() is just a resume() for devices
-        * that suspended with irqs off ... no overall powerup.
-        */
-       device_power_up();
- Enable_irqs:
-       local_irq_enable();
-       return error;
-}
-
-int swsusp_resume(void)
-{
-       int error;
-
-       local_irq_disable();
-       /* NOTE:  device_power_down() is just a suspend() with irqs off;
-        * it has no special "power things down" semantics
-        */
-       if (device_power_down(PMSG_PRETHAW))
-               printk(KERN_ERR "Some devices failed to power down, very bad\n");
-       /* We'll ignore saved state, but this gets preempt count (etc) right */
-       save_processor_state();
-       error = restore_highmem();
-       if (!error) {
-               error = swsusp_arch_resume();
-               /* The code below is only ever reached in case of a failure.
-                * Otherwise execution continues at place where
-                * swsusp_arch_suspend() was called
-                */
-               BUG_ON(!error);
-               /* This call to restore_highmem() undos the previous one */
-               restore_highmem();
-       }
-       /* The only reason why swsusp_arch_resume() can fail is memory being
-        * very tight, so we have to free it as soon as we can to avoid
-        * subsequent failures
-        */
-       swsusp_free();
-       restore_processor_state();
-       touch_softlockup_watchdog();
-       device_power_up();
-       local_irq_enable();
-       return error;
-}