staging/lustre: remove CFS_MODULE_PARM

Patch generated by coccinelle:

@generic_type@
declarer name CFS_MODULE_PARM;
declarer name module_param;
declarer name MODULE_PARM_DESC;
expression E1, E2, E3, E4;
type t;
@@
-CFS_MODULE_PARM(E1, E2, t, E3, E4);
+module_param(E1, t, E3);
+MODULE_PARM_DESC(E1, E4);

@charp@
expression E1, E2, E3, E4, E5;
@@
-CFS_MODULE_PARM(E1, E2, E3, E4, E5);
+module_param(E1, E3, E4);
+MODULE_PARM_DESC(E1, E5);

With manual modification to remove CFS_MODULE_PARM definition and
fix up checkpatch.pl warnnings.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index ba14c31..8cab09c 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -70,13 +70,6 @@
 
 #include <linux/libcfs/linux/portals_compat25.h>
 
-
-/******************************************************************************/
-/* Module parameter support */
-#define CFS_MODULE_PARM(name, t, type, perm, desc) \
-       module_param(name, type, perm);\
-       MODULE_PARM_DESC(name, desc)
-
 /* ------------------------------------------------------------------ */
 
 # define LI_POISON 0x5a5a5a5a

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/acceptor.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/api-ni.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/lib-move.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/lib-ptl.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/module.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/router.c
Simple merge

diff --cc drivers/staging/lustre/lnet/selftest/brw_test.c
Simple merge

diff --cc drivers/staging/lustre/lnet/selftest/framework.c
Simple merge

diff --cc drivers/staging/lustre/lnet/selftest/ping_test.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ldlm/ldlm_request.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/debug.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/hash.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/lloop.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/lu_object.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/pinger.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/service.c
Simple merge