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>

diff --git a/include/linux/console.h b/include/linux/console.h
index fa5941f4f9c5459590270c07e9431ad9a1a66cc5..0d48e0deb2139bd330b01c2c34f985a862024bb9 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -649,7 +649,7 @@ extern bool console_suspend_enabled;
 
 /* Suspend and resume console messages over PM events */
 extern void console_suspend_all(void);
-extern void resume_console(void);
+extern void console_resume_all(void);
 
 int mda_console_init(void);
 

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 8f95870030a335b73f062fa2a38da2b143f2bf5f..6fcc46f3eb39c393f2112c512b70bbb7cea3a489 100644 (file)
--- 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 a18f6016ce6caf08f69241be00e89de8d8e752ff..c9f60670a2610f8167516975eeee30c929e790ab 100644 (file)
--- 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 f296dd0a1a187aa7bfaae908ceff743ce4343c28..c3da3db58cdf8d9251943b7ffb8e3aff2e7bb9cb 100644 (file)
--- 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 0666d3e098972e963767e109517b6d623a353ff5..128d671e97a32897b874d37217c05ba8c492b050 100644 (file)
--- 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;

diff --git a/tools/power/pm-graph/config/custom-timeline-functions.cfg b/tools/power/pm-graph/config/custom-timeline-functions.cfg
index 80ba55250163d6b1796a7974ee7a5f757a95275d..0321b59518f397b1d6ba1ea1b026555450c2b510 100644 (file)
--- a/tools/power/pm-graph/config/custom-timeline-functions.cfg
+++ b/tools/power/pm-graph/config/custom-timeline-functions.cfg
@@ -128,7 +128,7 @@ syscore_suspend:
 arch_enable_nonboot_cpus_end:
 syscore_resume:
 acpi_pm_finish:
-resume_console:
+console_resume_all:
 acpi_pm_end:
 pm_restore_gfp_mask:
 thaw_processes:

diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py
index 114c3d0c6619297156ad9caebed03a877803f118..e2261f33a08298f92cd415a7385c7f551c67b376 100755 (executable)
--- a/tools/power/pm-graph/sleepgraph.py
+++ b/tools/power/pm-graph/sleepgraph.py
@@ -216,7 +216,7 @@ class SystemValues:
                'arch_enable_nonboot_cpus_end': {},
                'syscore_resume': {},
                'acpi_pm_finish': {},
-               'resume_console': {},
+               'console_resume_all': {},
                'acpi_pm_end': {},
                'pm_restore_gfp_mask': {},
                'thaw_processes': {},
@@ -3459,7 +3459,7 @@ def parseTraceLog(live=False):
        tracewatch = ['irq_wakeup']
        if sysvals.usekprobes:
                tracewatch += ['sync_filesystems', 'freeze_processes', 'syscore_suspend',
-                       'syscore_resume', 'resume_console', 'thaw_processes', 'CPU_ON',
+                       'syscore_resume', 'console_resume_all', 'thaw_processes', 'CPU_ON',
                        'CPU_OFF', 'acpi_suspend']
 
        # extract the callgraph and traceevent data