Commit 9c27847d authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Rusty Russell
Browse files

kernel/params: constify struct kernel_param_ops uses 



Most code already uses consts for the struct kernel_param_ops,
sweep the kernel for the last offending stragglers. Other than
include/linux/moduleparam.h and kernel/params.c all other changes
were generated with the following Coccinelle SmPL patch. Merge
conflicts between trees can be handled with Coccinelle.

In the future git could get Coccinelle merge support to deal with
patch --> fail --> grammar --> Coccinelle --> new patch conflicts
automatically for us on patches where the grammar is available and
the patch is of high confidence. Consider this a feature request.

Test compiled on x86_64 against:

	* allnoconfig
	* allmodconfig
	* allyesconfig

@ const_found @
identifier ops;
@@

const struct kernel_param_ops ops = {
};

@ const_not_found depends on !const_found @
identifier ops;
@@

-struct kernel_param_ops ops = {
+const struct kernel_param_ops ops = {
};

Generated-by: Coccinelle SmPL
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Junio C Hamano <gitster@pobox.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: cocci@systeme.lip6.fr
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 28b8d0c8

arch/s390/kernel/perf_cpum_sf.c

+1 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static int param_set_sfb_size(const char *val, const struct kernel_param *kp) 
}



#define param_check_sfb_size(name, p) __param_check(name, p, void)

static struct kernel_param_ops param_ops_sfb_size = {

static const struct kernel_param_ops param_ops_sfb_size = {

	.set = param_set_sfb_size,

	.get = param_get_sfb_size,

};

arch/x86/kvm/mmu_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int mmu_audit_set(const char *val, const struct kernel_param *kp) 
	return 0;

}



static struct kernel_param_ops audit_param_ops = {

static const struct kernel_param_ops audit_param_ops = {

	.set = mmu_audit_set,

	.get = param_get_bool,

};

arch/x86/platform/uv/uv_nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int param_set_local64(const char *val, const struct kernel_param *kp) 
	return 0;

}



static struct kernel_param_ops param_ops_local64 = {

static const struct kernel_param_ops param_ops_local64 = {

	.get = param_get_local64,

	.set = param_set_local64,

};

drivers/block/null_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int null_set_queue_mode(const char *str, const struct kernel_param *kp) 
	return null_param_store_val(str, &queue_mode, NULL_Q_BIO, NULL_Q_MQ);

}



static struct kernel_param_ops null_queue_mode_param_ops = {

static const struct kernel_param_ops null_queue_mode_param_ops = {

	.set	= null_set_queue_mode,

	.get	= param_get_int,

};
@@ -127,7 +127,7 @@ static int null_set_irqmode(const char *str, const struct kernel_param *kp) 
					NULL_IRQ_TIMER);

}



static struct kernel_param_ops null_irqmode_param_ops = {

static const struct kernel_param_ops null_irqmode_param_ops = {

	.set	= null_set_irqmode,

	.get	= param_get_int,

};

drivers/char/ipmi/ipmi_watchdog.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int set_param_timeout(const char *val, const struct kernel_param *kp) 
	return rv;

}



static struct kernel_param_ops param_ops_timeout = {

static const struct kernel_param_ops param_ops_timeout = {

	.set = set_param_timeout,

	.get = param_get_int,

};
@@ -270,14 +270,14 @@ static int set_param_wdog_ifnum(const char *val, const struct kernel_param *kp) 
	return 0;

}



static struct kernel_param_ops param_ops_wdog_ifnum = {

static const struct kernel_param_ops param_ops_wdog_ifnum = {

	.set = set_param_wdog_ifnum,

	.get = param_get_int,

};



#define param_check_wdog_ifnum param_check_int



static struct kernel_param_ops param_ops_str = {

static const struct kernel_param_ops param_ops_str = {

	.set = set_param_str,

	.get = get_param_str,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE