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>

diff --git a/include/linux/console.h b/include/linux/console.h
index eba367bf605da6ef798ea0b6587b7c2f2ad4188d..fa5941f4f9c5459590270c07e9431ad9a1a66cc5 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -648,7 +648,7 @@ static inline void console_sysfs_notify(void)
 extern bool console_suspend_enabled;
 
 /* Suspend and resume console messages over PM events */
-extern void suspend_console(void);
+extern void console_suspend_all(void);
 extern void resume_console(void);
 
 int mda_console_init(void);

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index c0caa14880c3b904130d1d869d11a24958c9a29b..8f95870030a335b73f062fa2a38da2b143f2bf5f 100644 (file)
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -1007,7 +1007,7 @@ int kernel_kexec(void)
                        error = -EBUSY;
                        goto Restore_console;
                }
-               suspend_console();
+               console_suspend_all();
                error = dpm_suspend_start(PMSG_FREEZE);
                if (error)
                        goto Resume_console;

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 1f87aa01ba44f00096f05d41ab3043dbc2428f6a..a18f6016ce6caf08f69241be00e89de8d8e752ff 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -411,7 +411,7 @@ int hibernation_snapshot(int platform_mode)
                goto Thaw;
        }
 
-       suspend_console();
+       console_suspend_all();
        pm_restrict_gfp_mask();
 
        error = dpm_suspend(PMSG_FREEZE);
@@ -547,7 +547,7 @@ int hibernation_restore(int platform_mode)
        int error;
 
        pm_prepare_console();
-       suspend_console();
+       console_suspend_all();
        pm_restrict_gfp_mask();
        error = dpm_suspend_start(PMSG_QUIESCE);
        if (!error) {
@@ -586,7 +586,7 @@ int hibernation_platform_enter(void)
                goto Close;
 
        entering_platform_hibernation = true;
-       suspend_console();
+       console_suspend_all();
        error = dpm_suspend_start(PMSG_HIBERNATE);
        if (error) {
                if (hibernation_ops->recover)
@@ -896,7 +896,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data)
        if (error)
                goto dpm_complete;
 
-       suspend_console();
+       console_suspend_all();
 
        error = dpm_suspend(PMSG_FREEZE);
        if (error)

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 09f8397bae15fb9c895d060d7708c9bca5ef62f7..f296dd0a1a187aa7bfaae908ceff743ce4343c28 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -502,7 +502,7 @@ int suspend_devices_and_enter(suspend_state_t state)
        if (error)
                goto Close;
 
-       suspend_console();
+       console_suspend_all();
        suspend_test_start();
        error = dpm_suspend_start(PMSG_SUSPEND);
        if (error) {

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 07668433644b8a746229d170fde6ea416a09422b..0666d3e098972e963767e109517b6d623a353ff5 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2733,11 +2733,11 @@ module_param_named(console_no_auto_verbose, printk_console_no_auto_verbose, bool
 MODULE_PARM_DESC(console_no_auto_verbose, "Disable console loglevel raise to highest on oops/panic/etc");
 
 /**
- * suspend_console - suspend the console subsystem
+ * console_suspend_all - suspend the console subsystem
  *
  * This disables printk() while we go into suspend states
  */
-void suspend_console(void)
+void console_suspend_all(void)
 {
        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 4f80ad7d72755b308bdc4d963f620a9548dcdbb3..80ba55250163d6b1796a7974ee7a5f757a95275d 100644 (file)
--- a/tools/power/pm-graph/config/custom-timeline-functions.cfg
+++ b/tools/power/pm-graph/config/custom-timeline-functions.cfg
@@ -122,7 +122,7 @@ freeze_processes:
 freeze_kernel_threads:
 pm_restrict_gfp_mask:
 acpi_suspend_begin:
-suspend_console:
+console_suspend_all:
 acpi_pm_prepare:
 syscore_suspend:
 arch_enable_nonboot_cpus_end:

diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py
index 918eae58b0b45f62b3dc0ebce501f39c01918d6f..114c3d0c6619297156ad9caebed03a877803f118 100755 (executable)
--- a/tools/power/pm-graph/sleepgraph.py
+++ b/tools/power/pm-graph/sleepgraph.py
@@ -210,7 +210,7 @@ class SystemValues:
                'hibernate_preallocate_memory': {},
                'create_basic_memory_bitmaps': {},
                'swsusp_write': {},
-               'suspend_console': {},
+               'console_suspend_all': {},
                'acpi_pm_prepare': {},
                'syscore_suspend': {},
                'arch_enable_nonboot_cpus_end': {},