]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
printk: Rename console_stop to console_suspend
authorMarcos Paulo de Souza <mpdesouza@suse.com>
Wed, 26 Feb 2025 19:59:03 +0000 (16:59 -0300)
committerPetr Mladek <pmladek@suse.com>
Tue, 11 Mar 2025 11:41:55 +0000 (12:41 +0100)
The intent of console_stop was in fact to suspend it, so rename the
function 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-3-0b878577f2e6@suse.com
[pmladek@suse.com: Fixed typo in the commit message. Updated also new drm_log.c]
Signed-off-by: Petr Mladek <pmladek@suse.com>
drivers/gpu/drm/clients/drm_log.c
drivers/tty/serial/serial_core.c
include/linux/console.h
kernel/printk/printk.c

index 379850c83e511add6b8cdcda39de9e7a52073200..755b41512d8151255a107f5f8792dcd5a7f10f12 100644 (file)
@@ -323,7 +323,7 @@ static int drm_log_client_suspend(struct drm_client_dev *client, bool _console_l
 {
        struct drm_log *dlog = client_to_drm_log(client);
 
-       console_stop(&dlog->con);
+       console_suspend(&dlog->con);
 
        return 0;
 }
index 74fa02b237729931928b2ae4902c699ec017af94..ff2499dbbb82265a19ea771392bdb443ef3da25e 100644 (file)
@@ -2442,10 +2442,10 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
        }
 
        /*
-        * Disable the console device before suspending.
+        * Suspend the console device before suspending the port.
         */
        if (uart_console(uport))
-               console_stop(uport->cons);
+               console_suspend(uport->cons);
 
        uart_change_pm(state, UART_PM_STATE_OFF);
 
index 0d48e0deb2139bd330b01c2c34f985a862024bb9..74587eeea3c7407efd380ca30451f2e0ecbc4b98 100644 (file)
@@ -633,7 +633,7 @@ extern void console_conditional_schedule(void);
 extern void console_unblank(void);
 extern void console_flush_on_panic(enum con_flush_mode mode);
 extern struct tty_driver *console_device(int *);
-extern void console_stop(struct console *);
+extern void console_suspend(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
 extern int braille_register_console(struct console *, int index,
index 128d671e97a32897b874d37217c05ba8c492b050..48e4fc51c88fbc7b0fa1d8107cf3af1962ce9dd6 100644 (file)
@@ -3497,10 +3497,10 @@ struct tty_driver *console_device(int *index)
 
 /*
  * Prevent further output on the passed console device so that (for example)
- * serial drivers can disable console output before suspending a port, and can
+ * serial drivers can suspend console output before suspending a port, and can
  * re-enable output afterwards.
  */
-void console_stop(struct console *console)
+void console_suspend(struct console *console)
 {
        __pr_flush(console, 1000, true);
        console_list_lock();
@@ -3515,7 +3515,7 @@ void console_stop(struct console *console)
         */
        synchronize_srcu(&console_srcu);
 }
-EXPORT_SYMBOL(console_stop);
+EXPORT_SYMBOL(console_suspend);
 
 void console_start(struct console *console)
 {