Skip to content

Commit 63830ae

Browse files
marcospspmladek
authored andcommitted
printk: Rename resume_console to console_resume_all
The function resume_console has a misleading name, since it resumes 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-2-0b878577f2e6@suse.com [pmladek@suse.com: Fixed typo in the commit message.] Signed-off-by: Petr Mladek <pmladek@suse.com>
1 parent e9cec44 commit 63830ae

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

include/linux/console.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ extern bool console_suspend_enabled;
649649

650650
/* Suspend and resume console messages over PM events */
651651
extern void console_suspend_all(void);
652-
extern void resume_console(void);
652+
extern void console_resume_all(void);
653653

654654
int mda_console_init(void);
655655

kernel/kexec_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ int kernel_kexec(void)
10611061
Resume_devices:
10621062
dpm_resume_end(PMSG_RESTORE);
10631063
Resume_console:
1064-
resume_console();
1064+
console_resume_all();
10651065
thaw_processes();
10661066
Restore_console:
10671067
pm_restore_console();

kernel/power/hibernate.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ int hibernation_snapshot(int platform_mode)
437437
if (error || !in_suspend)
438438
pm_restore_gfp_mask();
439439

440-
resume_console();
440+
console_resume_all();
441441
dpm_complete(msg);
442442

443443
Close:
@@ -561,7 +561,7 @@ int hibernation_restore(int platform_mode)
561561
}
562562
dpm_resume_end(PMSG_RECOVER);
563563
pm_restore_gfp_mask();
564-
resume_console();
564+
console_resume_all();
565565
pm_restore_console();
566566
return error;
567567
}
@@ -634,7 +634,7 @@ int hibernation_platform_enter(void)
634634
Resume_devices:
635635
entering_platform_hibernation = false;
636636
dpm_resume_end(PMSG_RESTORE);
637-
resume_console();
637+
console_resume_all();
638638

639639
Close:
640640
hibernation_ops->end();
@@ -920,7 +920,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data)
920920
dpm_resume:
921921
dpm_resume(PMSG_THAW);
922922

923-
resume_console();
923+
console_resume_all();
924924

925925
dpm_complete:
926926
dpm_complete(PMSG_THAW);

kernel/power/suspend.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,9 @@ int suspend_devices_and_enter(suspend_state_t state)
521521
suspend_test_start();
522522
dpm_resume_end(PMSG_RESUME);
523523
suspend_test_finish("resume devices");
524-
trace_suspend_resume(TPS("resume_console"), state, true);
525-
resume_console();
526-
trace_suspend_resume(TPS("resume_console"), state, false);
524+
trace_suspend_resume(TPS("console_resume_all"), state, true);
525+
console_resume_all();
526+
trace_suspend_resume(TPS("console_resume_all"), state, false);
527527

528528
Close:
529529
platform_resume_end(state);

kernel/printk/printk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2760,7 +2760,7 @@ void console_suspend_all(void)
27602760
synchronize_srcu(&console_srcu);
27612761
}
27622762

2763-
void resume_console(void)
2763+
void console_resume_all(void)
27642764
{
27652765
struct console_flush_type ft;
27662766
struct console *con;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ syscore_suspend:
128128
arch_enable_nonboot_cpus_end:
129129
syscore_resume:
130130
acpi_pm_finish:
131-
resume_console:
131+
console_resume_all:
132132
acpi_pm_end:
133133
pm_restore_gfp_mask:
134134
thaw_processes:

tools/power/pm-graph/sleepgraph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class SystemValues:
216216
'arch_enable_nonboot_cpus_end': {},
217217
'syscore_resume': {},
218218
'acpi_pm_finish': {},
219-
'resume_console': {},
219+
'console_resume_all': {},
220220
'acpi_pm_end': {},
221221
'pm_restore_gfp_mask': {},
222222
'thaw_processes': {},
@@ -3459,7 +3459,7 @@ def parseTraceLog(live=False):
34593459
tracewatch = ['irq_wakeup']
34603460
if sysvals.usekprobes:
34613461
tracewatch += ['sync_filesystems', 'freeze_processes', 'syscore_suspend',
3462-
'syscore_resume', 'resume_console', 'thaw_processes', 'CPU_ON',
3462+
'syscore_resume', 'console_resume_all', 'thaw_processes', 'CPU_ON',
34633463
'CPU_OFF', 'acpi_suspend']
34643464

34653465
# extract the callgraph and traceevent data

0 commit comments

Comments
 (0)