Skip to contentSkip to conversation

Make suspend less talkative

PM Applied Pavel Machek 2 participants 2 messages Jul 26, 2003 – Aug 5, 2003

Subsystems (2)
ACPI Driver core
lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

Hi!

This is trivial killing of unneccessary printks. They mess up screen badly during suspend. Patrick, some of those are patches to your parts of code, so please try to propagate at least them to Linus.
Pavel

drivers/acpi/sleep/main.c +1 -1
Index: linux/drivers/acpi/sleep/main.c
===================================================================
@@ -197,7 +205,7 @@
 		break;
 	}
 	local_irq_restore(flags);
-	printk(KERN_CRIT "Back to C!\n");
+	printk(KERN_DEBUG "Back to C!\n");
 
 	return status;
 }
arch/i386/kernel/sysenter.c +0 -2
Index: linux/arch/i386/kernel/sysenter.c
===================================================================
@@ -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();	
 }
drivers/base/power.c +0 -6
Index: linux/drivers/base/power.c
===================================================================
@@ -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);
kernel/suspend.c +1 -4
Index: linux/kernel/suspend.c
===================================================================
@@ -561,7 +596,6 @@
 			free_suspend_pagedir((unsigned long) pagedir);
 			return NULL;
 		}
-		printk(".");
 		SetPageNosave(virt_to_page(p->address));
 		p->orig_address = 0;
 		p++;

@@ -852,7 +853,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)

@@ -888,12 +881,11 @@
 			 * using normal kernel mechanism.
 			 */
 			do_magic(0);
-		PRINTK("Restarting processes...\n");
 		thaw_processes();
 	}
 	software_suspend_enabled = 1;
 	MDELAY(1000);
-	restore_console ();
+	restore_console();
 }
 
 /*
Signature · 2 lines
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
Applied
#1 lore raw
Quoted 4 lines

This is trivial killing of unneccessary printks. They mess up screen badly during suspend. Patrick, some of those are patches to your parts of code, so please try to propagate at least them to Linus.

Applied, thanks.

-pat