ChangeSet 1.2231.1.96, 2005/03/28 19:43:12-08:00, [EMAIL PROTECTED]
[PATCH] swsusp: small updates
This kills unused macro and write-only variable, and adds messages where
something goes wrong with suspending devices.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
include/linux/suspend.h | 2 --
kernel/power/main.c | 8 ++++++--
kernel/power/swsusp.c | 7 +++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff -Nru a/include/linux/suspend.h b/include/linux/suspend.h
--- a/include/linux/suspend.h 2005-03-28 21:27:38 -08:00
+++ b/include/linux/suspend.h 2005-03-28 21:27:38 -08:00
@@ -34,8 +34,6 @@
#define SWAP_FILENAME_MAXLENGTH 32
-#define SUSPEND_PD_PAGES(x) (((x)*sizeof(struct pbe))/PAGE_SIZE+1)
-
extern dev_t swsusp_resume_device;
/* mm/vmscan.c */
diff -Nru a/kernel/power/main.c b/kernel/power/main.c
--- a/kernel/power/main.c 2005-03-28 21:27:38 -08:00
+++ b/kernel/power/main.c 2005-03-28 21:27:38 -08:00
@@ -65,8 +65,10 @@
goto Thaw;
}
- if ((error = device_suspend(PMSG_SUSPEND)))
+ if ((error = device_suspend(PMSG_SUSPEND))) {
+ printk(KERN_ERR "Some devices failed to suspend\n");
goto Finish;
+ }
return 0;
Finish:
if (pm_ops->finish)
@@ -85,8 +87,10 @@
local_irq_save(flags);
- if ((error = device_power_down(PMSG_SUSPEND)))
+ if ((error = device_power_down(PMSG_SUSPEND))) {
+ printk(KERN_ERR "Some devices failed to power down\n");
goto Done;
+ }
error = pm_ops->enter(state);
device_power_up();
Done:
diff -Nru a/kernel/power/swsusp.c b/kernel/power/swsusp.c
--- a/kernel/power/swsusp.c 2005-03-28 21:27:38 -08:00
+++ b/kernel/power/swsusp.c 2005-03-28 21:27:38 -08:00
@@ -98,7 +98,6 @@
*/
suspend_pagedir_t *pagedir_nosave __nosavedata = NULL;
static suspend_pagedir_t *pagedir_save;
-static int pagedir_order __nosavedata = 0;
#define SWSUSP_SIG "S1SUSPEND"
@@ -920,7 +919,8 @@
{
int error;
local_irq_disable();
- device_power_down(PMSG_FREEZE);
+ if (device_power_down(PMSG_FREEZE))
+ 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 = swsusp_arch_resume();
@@ -1219,7 +1219,6 @@
return -EPERM;
}
nr_copy_pages = swsusp_info.image_pages;
- pagedir_order = get_bitmask_order(SUSPEND_PD_PAGES(nr_copy_pages));
return error;
}
@@ -1238,7 +1237,7 @@
*/
error = bio_write_page(0, &swsusp_header);
} else {
- pr_debug(KERN_ERR "swsusp: Suspend partition has wrong
signature?\n");
+ printk(KERN_ERR "swsusp: Suspend partition has wrong
signature?\n");
return -EINVAL;
}
if (!error)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
