Skip to content

Commit

Permalink
printk: Rename console_start to console_resume
Browse files Browse the repository at this point in the history
The intent of console_start was to resume a previously suspended console,
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-4-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>
  • Loading branch information
Marcos Paulo de Souza authored and Petr Mladek committed Mar 11, 2025
1 parent 242fafe commit 5395e09
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/clients/drm_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static int drm_log_client_resume(struct drm_client_dev *client, bool _console_lo
{
struct drm_log *dlog = client_to_drm_log(client);

console_start(&dlog->con);
console_resume(&dlog->con);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2500,7 +2500,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
uart_port_unlock_irq(uport);
}
if (console_suspend_enabled)
console_start(uport->cons);
console_resume(uport->cons);
}

if (tty_port_suspended(port)) {
Expand Down
2 changes: 1 addition & 1 deletion include/linux/console.h
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ 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_suspend(struct console *);
extern void console_start(struct console *);
extern void console_resume(struct console *);
extern int is_console_locked(void);
extern int braille_register_console(struct console *, int index,
char *console_options, char *braille_options);
Expand Down
4 changes: 2 additions & 2 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -3517,7 +3517,7 @@ void console_suspend(struct console *console)
}
EXPORT_SYMBOL(console_suspend);

void console_start(struct console *console)
void console_resume(struct console *console)
{
struct console_flush_type ft;
bool is_nbcon;
Expand All @@ -3542,7 +3542,7 @@ void console_start(struct console *console)

__pr_flush(console, 1000, true);
}
EXPORT_SYMBOL(console_start);
EXPORT_SYMBOL(console_resume);

#ifdef CONFIG_PRINTK
static int unregister_console_locked(struct console *console);
Expand Down

0 comments on commit 5395e09

Please sign in to comment.