diff options
| author | Marcos Paulo de Souza <mpdesouza@suse.com> | 2025-02-26 16:59:02 -0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-03-11 11:51:27 +0100 |
| commit | 63830aef74188354806ea3c9043dd3929c6e47f3 (patch) | |
| tree | 0f165130c7f68992b04e060d631c524240a47e8a /kernel | |
| parent | printk: Rename suspend_console to console_suspend_all (diff) | |
| download | linux-63830aef74188354806ea3c9043dd3929c6e47f3.tar.gz linux-63830aef74188354806ea3c9043dd3929c6e47f3.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kexec_core.c | 2 | ||||
| -rw-r--r-- | kernel/power/hibernate.c | 8 | ||||
| -rw-r--r-- | kernel/power/suspend.c | 6 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 8f95870030a3..6fcc46f3eb39 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -1061,7 +1061,7 @@ int kernel_kexec(void) Resume_devices: dpm_resume_end(PMSG_RESTORE); Resume_console: - resume_console(); + console_resume_all(); thaw_processes(); Restore_console: pm_restore_console(); diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index a18f6016ce6c..c9f60670a261 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -437,7 +437,7 @@ int hibernation_snapshot(int platform_mode) if (error || !in_suspend) pm_restore_gfp_mask(); - resume_console(); + console_resume_all(); dpm_complete(msg); Close: @@ -561,7 +561,7 @@ int hibernation_restore(int platform_mode) } dpm_resume_end(PMSG_RECOVER); pm_restore_gfp_mask(); - resume_console(); + console_resume_all(); pm_restore_console(); return error; } @@ -634,7 +634,7 @@ int hibernation_platform_enter(void) Resume_devices: entering_platform_hibernation = false; dpm_resume_end(PMSG_RESTORE); - resume_console(); + console_resume_all(); Close: hibernation_ops->end(); @@ -920,7 +920,7 @@ skip: dpm_resume: dpm_resume(PMSG_THAW); - resume_console(); + console_resume_all(); dpm_complete: dpm_complete(PMSG_THAW); diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index f296dd0a1a18..c3da3db58cdf 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -521,9 +521,9 @@ int suspend_devices_and_enter(suspend_state_t state) suspend_test_start(); dpm_resume_end(PMSG_RESUME); suspend_test_finish("resume devices"); - trace_suspend_resume(TPS("resume_console"), state, true); - resume_console(); - trace_suspend_resume(TPS("resume_console"), state, false); + trace_suspend_resume(TPS("console_resume_all"), state, true); + console_resume_all(); + trace_suspend_resume(TPS("console_resume_all"), state, false); Close: platform_resume_end(state); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 0666d3e09897..128d671e97a3 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2760,7 +2760,7 @@ void console_suspend_all(void) synchronize_srcu(&console_srcu); } -void resume_console(void) +void console_resume_all(void) { struct console_flush_type ft; struct console *con; |