From 8cf4ddc34151b35f56fc08196e5a39be18c9b344 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Mon, 4 Aug 2003 01:49:17 -0700 Subject: [PATCH] [power] Kill some unnessecary printk()s. From Pavel Machek. --- arch/i386/kernel/sysenter.c | 2 -- drivers/acpi/sleep/main.c | 2 +- drivers/base/power.c | 6 ------ kernel/power/swsusp.c | 5 +---- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c index 5c319cd4b5f65..c9194e33ff1ce 100644 --- a/arch/i386/kernel/sysenter.c +++ b/arch/i386/kernel/sysenter.c @@ -31,8 +31,6 @@ void enable_sep_cpu(void *info) 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(); } diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 3b17c9d2e87ac..84160ebbc7496 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -197,7 +197,7 @@ acpi_system_suspend( break; } local_irq_restore(flags); - printk(KERN_CRIT "Back to C!\n"); + printk(KERN_DEBUG "Back to C!\n"); return status; } diff --git a/drivers/base/power.c b/drivers/base/power.c index 78346491389a8..ba83ee21f7586 100644 --- a/drivers/base/power.c +++ b/drivers/base/power.c @@ -52,8 +52,6 @@ int device_suspend(u32 state, u32 level) 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 @@ void device_resume(u32 level) } } up_write(&devices_subsys.rwsem); - - printk(KERN_EMERG "Devices Resumed\n"); } /** @@ -125,8 +121,6 @@ void device_shutdown(void) { 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); diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index 5b3ab78e06f99..60337de056828 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c @@ -459,7 +459,6 @@ static suspend_pagedir_t *create_suspend_pagedir(int nr_copy_pages) free_suspend_pagedir((unsigned long) pagedir); return NULL; } - printk("."); SetPageNosave(virt_to_page(p->address)); p->orig_address = 0; p++; @@ -750,7 +749,6 @@ void do_magic_suspend_2(void) 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) @@ -786,12 +784,11 @@ static void do_software_suspend(void) * using normal kernel mechanism. */ do_magic(0); - PRINTK("Restarting processes...\n"); thaw_processes(); } software_suspend_enabled = 1; MDELAY(1000); - restore_console (); + restore_console(); } /* -- 2.53.0