tty/sysrq: constify the sysrq API
The user is not supposed to thinker with the underlying sysrq_key_op. Make that explicit by adding a handful of const notations. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: linux-kernel@vger.kernel.org Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: https://lore.kernel.org/r/20200513214351.2138580-2-emil.l.velikov@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
0f1c9688a1
commit
23cbedf812
@@ -518,9 +518,9 @@ static int sysrq_key_table_key2index(int key)
|
||||
/*
|
||||
* get and put functions for the table, exposed to modules.
|
||||
*/
|
||||
static struct sysrq_key_op *__sysrq_get_key_op(int key)
|
||||
static const struct sysrq_key_op *__sysrq_get_key_op(int key)
|
||||
{
|
||||
struct sysrq_key_op *op_p = NULL;
|
||||
const struct sysrq_key_op *op_p = NULL;
|
||||
int i;
|
||||
|
||||
i = sysrq_key_table_key2index(key);
|
||||
@@ -530,7 +530,7 @@ static struct sysrq_key_op *__sysrq_get_key_op(int key)
|
||||
return op_p;
|
||||
}
|
||||
|
||||
static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
|
||||
static void __sysrq_put_key_op(int key, const struct sysrq_key_op *op_p)
|
||||
{
|
||||
int i = sysrq_key_table_key2index(key);
|
||||
|
||||
@@ -540,7 +540,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
|
||||
|
||||
void __handle_sysrq(int key, bool check_mask)
|
||||
{
|
||||
struct sysrq_key_op *op_p;
|
||||
const struct sysrq_key_op *op_p;
|
||||
int orig_log_level;
|
||||
int orig_suppress_printk;
|
||||
int i;
|
||||
@@ -1063,8 +1063,8 @@ int sysrq_toggle_support(int enable_mask)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sysrq_toggle_support);
|
||||
|
||||
static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
|
||||
struct sysrq_key_op *remove_op_p)
|
||||
static int __sysrq_swap_key_ops(int key, const struct sysrq_key_op *insert_op_p,
|
||||
const struct sysrq_key_op *remove_op_p)
|
||||
{
|
||||
int retval;
|
||||
|
||||
@@ -1087,13 +1087,13 @@ static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,
|
||||
return retval;
|
||||
}
|
||||
|
||||
int register_sysrq_key(int key, struct sysrq_key_op *op_p)
|
||||
int register_sysrq_key(int key, const struct sysrq_key_op *op_p)
|
||||
{
|
||||
return __sysrq_swap_key_ops(key, op_p, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL(register_sysrq_key);
|
||||
|
||||
int unregister_sysrq_key(int key, struct sysrq_key_op *op_p)
|
||||
int unregister_sysrq_key(int key, const struct sysrq_key_op *op_p)
|
||||
{
|
||||
return __sysrq_swap_key_ops(key, NULL, op_p);
|
||||
}
|
||||
|
Reference in New Issue
Block a user