Skip to content

Commit e9cec44

Browse files
marcospspmladek
authored andcommitted
printk: Rename suspend_console to console_suspend_all
The function suspend_console has a misleading name, since it suspends all consoles, so rename it accordingly. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.com> Reviewed-by: John Ogness <john.ogness@linutronix.de> Link: https://lore.kernel.org/r/20250226-printk-renaming-v1-1-0b878577f2e6@suse.com [pmladek@suse.com: Fixed typo in the commit message.] Signed-off-by: Petr Mladek <pmladek@suse.com>
1 parent 96c8470 commit e9cec44

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

include/linux/console.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ static inline void console_sysfs_notify(void)
648648
extern bool console_suspend_enabled;
649649

650650
/* Suspend and resume console messages over PM events */
651-
extern void suspend_console(void);
651+
extern void console_suspend_all(void);
652652
extern void resume_console(void);
653653

654654
int mda_console_init(void);

kernel/kexec_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ int kernel_kexec(void)
10071007
error = -EBUSY;
10081008
goto Restore_console;
10091009
}
1010-
suspend_console();
1010+
console_suspend_all();
10111011
error = dpm_suspend_start(PMSG_FREEZE);
10121012
if (error)
10131013
goto Resume_console;

kernel/power/hibernate.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ int hibernation_snapshot(int platform_mode)
411411
goto Thaw;
412412
}
413413

414-
suspend_console();
414+
console_suspend_all();
415415
pm_restrict_gfp_mask();
416416

417417
error = dpm_suspend(PMSG_FREEZE);
@@ -547,7 +547,7 @@ int hibernation_restore(int platform_mode)
547547
int error;
548548

549549
pm_prepare_console();
550-
suspend_console();
550+
console_suspend_all();
551551
pm_restrict_gfp_mask();
552552
error = dpm_suspend_start(PMSG_QUIESCE);
553553
if (!error) {
@@ -586,7 +586,7 @@ int hibernation_platform_enter(void)
586586
goto Close;
587587

588588
entering_platform_hibernation = true;
589-
suspend_console();
589+
console_suspend_all();
590590
error = dpm_suspend_start(PMSG_HIBERNATE);
591591
if (error) {
592592
if (hibernation_ops->recover)
@@ -896,7 +896,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data)
896896
if (error)
897897
goto dpm_complete;
898898

899-
suspend_console();
899+
console_suspend_all();
900900

901901
error = dpm_suspend(PMSG_FREEZE);
902902
if (error)

kernel/power/suspend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ int suspend_devices_and_enter(suspend_state_t state)
502502
if (error)
503503
goto Close;
504504

505-
suspend_console();
505+
console_suspend_all();
506506
suspend_test_start();
507507
error = dpm_suspend_start(PMSG_SUSPEND);
508508
if (error) {

kernel/printk/printk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,11 +2733,11 @@ module_param_named(console_no_auto_verbose, printk_console_no_auto_verbose, bool
27332733
MODULE_PARM_DESC(console_no_auto_verbose, "Disable console loglevel raise to highest on oops/panic/etc");
27342734

27352735
/**
2736-
* suspend_console - suspend the console subsystem
2736+
* console_suspend_all - suspend the console subsystem
27372737
*
27382738
* This disables printk() while we go into suspend states
27392739
*/
2740-
void suspend_console(void)
2740+
void console_suspend_all(void)
27412741
{
27422742
struct console *con;
27432743

tools/power/pm-graph/config/custom-timeline-functions.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ freeze_processes:
122122
freeze_kernel_threads:
123123
pm_restrict_gfp_mask:
124124
acpi_suspend_begin:
125-
suspend_console:
125+
console_suspend_all:
126126
acpi_pm_prepare:
127127
syscore_suspend:
128128
arch_enable_nonboot_cpus_end:

tools/power/pm-graph/sleepgraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class SystemValues:
210210
'hibernate_preallocate_memory': {},
211211
'create_basic_memory_bitmaps': {},
212212
'swsusp_write': {},
213-
'suspend_console': {},
213+
'console_suspend_all': {},
214214
'acpi_pm_prepare': {},
215215
'syscore_suspend': {},
216216
'arch_enable_nonboot_cpus_end': {},

0 commit comments

Comments
 (0)