Skip to content

Commit

Permalink
printk: Constify name for add_preferred_console()
Browse files Browse the repository at this point in the history
While adding a preferred console handling for serial_core for serial port
hardware based device addressing, Jiri suggested we constify name for
add_preferred_console(). The name gets copied anyways. This allows serial
core to add a preferred console using serial drv->dev_name without copying
it.

Note that constifying options causes changes all over the place because of
struct console for match().

Suggested-by: Jiri Slaby <[email protected]>
Reviewed-by: Petr Mladek <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
tmlind authored and gregkh committed Oct 17, 2023
1 parent 545a4f8 commit 1e3c852
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/linux/console.h
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ enum con_flush_mode {
CONSOLE_REPLAY_ALL,
};

extern int add_preferred_console(char *name, const short idx, char *options);
extern int add_preferred_console(const char *name, const short idx, char *options);
extern void console_force_preferred_locked(struct console *con);
extern void register_console(struct console *);
extern int unregister_console(struct console *);
Expand Down
4 changes: 2 additions & 2 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2404,7 +2404,7 @@ static void set_user_specified(struct console_cmdline *c, bool user_specified)
console_set_on_cmdline = 1;
}

static int __add_preferred_console(char *name, const short idx, char *options,
static int __add_preferred_console(const char *name, const short idx, char *options,
char *brl_options, bool user_specified)
{
struct console_cmdline *c;
Expand Down Expand Up @@ -2521,7 +2521,7 @@ __setup("console=", console_setup);
* commonly to provide a default console (ie from PROM variables) when
* the user has not supplied one.
*/
int add_preferred_console(char *name, const short idx, char *options)
int add_preferred_console(const char *name, const short idx, char *options)
{
return __add_preferred_console(name, idx, options, NULL, false);
}
Expand Down

0 comments on commit 1e3c852

Please sign in to comment.