suspend/resume messages cleanup

suspend/resume messages cleanup

[Pavel Machek]

Hi!

Suspend/resume is way too verbose at the moment. It works good enough
to kill extra messages. Please apply,

							Pavel

--- /usr/src/tmp/linux/arch/i386/kernel/sysenter.c	2003-05-27 13:42:29.000000000 +0200
+++ /usr/src/linux/arch/i386/kernel/sysenter.c	2003-07-11 23:01:54.000000000 +0200
@@ -31,8 +31,6 @@
 	wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
 	wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0);
 	wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0);
-
-	printk("Enabling SEP on CPU %d\n", cpu);
 	put_cpu();	
 }
 
--- /usr/src/tmp/linux/drivers/base/power.c	2003-06-15 22:42:36.000000000 +0200
+++ /usr/src/linux/drivers/base/power.c	2003-07-11 22:43:21.000000000 +0200
@@ -52,8 +52,6 @@
 	struct device * dev;
 	int error = 0;
 
-	printk(KERN_EMERG "Suspending devices\n");
-
 	down_write(&devices_subsys.rwsem);
 	list_for_each_entry_reverse(dev,&devices_subsys.kset.list,kobj.entry) {
 		if (dev->driver && dev->driver->suspend) {
@@ -114,8 +112,6 @@
 		}
 	}
 	up_write(&devices_subsys.rwsem);
-
-	printk(KERN_EMERG "Devices Resumed\n");
 }
 
 /**
@@ -125,8 +121,6 @@
 {
 	struct device * dev;
 	
-	printk(KERN_EMERG "Shutting down devices\n");
-
 	down_write(&devices_subsys.rwsem);
 	list_for_each_entry_reverse(dev,&devices_subsys.kset.list,kobj.entry) {
 		pr_debug("shutting down %s: ",dev->name);
--- /usr/src/tmp/linux/kernel/suspend.c	2003-07-11 23:03:35.000000000 +0200
+++ /usr/src/linux/kernel/suspend.c	2003-07-11 22:57:01.000000000 +0200
@@ -143,8 +143,7 @@
 /*
  * Debug
  */
-#define	DEBUG_DEFAULT
-#undef	DEBUG_PROCESS
+#undef	DEBUG_DEFAULT
 #undef	DEBUG_SLOW
 #define TEST_SWSUSP 1		/* Set to 1 to reboot instead of halt machine after suspension */
 
@@ -563,7 +562,6 @@
 			free_suspend_pagedir((unsigned long) pagedir);
 			return NULL;
 		}
-		printk(".");
 		SetPageNosave(virt_to_page(p->address));
 		p->orig_address = 0;
 		p++;
@@ -585,8 +583,8 @@
 		return 1;
 
 	set_console (SUSPEND_CONSOLE);
-	if(vt_waitactive(SUSPEND_CONSOLE)) {
-		PRINTK("Bummer. Can't switch VCs.");
+	if (vt_waitactive(SUSPEND_CONSOLE)) {
+		printk(KERN_ERR "Bummer. Can't switch VCs.\n");
 		return 1;
 	}
 	orig_kmsg = kmsg_redirect;
@@ -854,7 +852,6 @@
 	free_pages((unsigned long) pagedir_nosave, pagedir_order);
 	spin_unlock_irq(&suspend_pagedir_lock);
 	mark_swapfiles(((swp_entry_t) {0}), MARK_SWAP_RESUME);
-	PRINTK(KERN_WARNING "%sLeaving do_magic_suspend_2...\n", name_suspend);	
 }
 
 static void do_software_suspend(void)

-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]