[PATCH] tty/sysrq: make sysrq_replay_logs_op const and refactor sysrq_mask()

[PATCH] tty/sysrq: make sysrq_replay_logs_op const and refactor sysrq_mask()

[xiaopeitux]

From: Pei Xiao <xiaopei01@kylinos.cn>

Mark sysrq_replay_logs_op as const and simplify sysrq_mask().

Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
---
 drivers/tty/sysrq.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index f85ce02e4725..c2a26abcb8cd 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -71,9 +71,7 @@ static bool sysrq_on(void)
  */
 int sysrq_mask(void)
 {
-	if (sysrq_always_enabled)
-		return 1;
-	return sysrq_enabled;
+	return sysrq_always_enabled ? 1 : sysrq_enabled;
 }
 EXPORT_SYMBOL_GPL(sysrq_mask);
 
@@ -454,7 +452,7 @@ static void sysrq_handle_replay_logs(u8 key)
 {
 	console_try_replay_all();
 }
-static struct sysrq_key_op sysrq_replay_logs_op = {
+static const struct sysrq_key_op sysrq_replay_logs_op = {
 	.handler        = sysrq_handle_replay_logs,
 	.help_msg       = "replay-kernel-logs(R)",
 	.action_msg     = "Replay kernel logs on consoles",
-- 
2.25.1

Re: [PATCH] tty/sysrq: make sysrq_replay_logs_op const and refactor sysrq_mask()

[Greg KH]

On Thu, Apr 03, 2025 at 03:15:35PM +0800, xiaopeitux@foxmail.com wrote:
> From: Pei Xiao <xiaopei01@kylinos.cn>
> 
> Mark sysrq_replay_logs_op as const and simplify sysrq_mask().
> 
> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> ---
>  drivers/tty/sysrq.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
> index f85ce02e4725..c2a26abcb8cd 100644
> --- a/drivers/tty/sysrq.c
> +++ b/drivers/tty/sysrq.c
> @@ -71,9 +71,7 @@ static bool sysrq_on(void)
>   */
>  int sysrq_mask(void)
>  {
> -	if (sysrq_always_enabled)
> -		return 1;
> -	return sysrq_enabled;
> +	return sysrq_always_enabled ? 1 : sysrq_enabled;

That's not simpler, it's now harder to read and parse.  Only use ?: in C
for places it has to be used, not for stuff like this where it's more
obvious if you use an if () line.

We write code for people first, compilers second.

Also, you can't do two different things in the same commit, sorry.

thanks,

greg k-h