Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6960736c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove cfs_module() macro 



Open code the module_init/module_exit lines, and also use
MODULE_VERSION, as it seems that was intended, but just never hooked up
at all.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 305ec768

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −9
Original line number Diff line number Diff line
@@ -107,15 +107,6 @@ typedef struct task_struct task_t; 
	current->journal_info = journal_info;   \

	} while(0)



/* Module interfaces */

#define cfs_module(name, version, init, fini) \

	module_init(init);		    \

	module_exit(fini)



/*

 * Signal

 */



/*

 * Timer

 */

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+3 −1
Original line number Diff line number Diff line
@@ -2898,5 +2898,7 @@ ksocknal_module_init (void) 
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");

MODULE_DESCRIPTION("Kernel TCP Socket LND v3.0.0");

MODULE_LICENSE("GPL");

MODULE_VERSION("3.0.0");



cfs_module(ksocknal, "3.0.0", ksocknal_module_init, ksocknal_module_fini);
 
module_init(ksocknal_module_init);

module_exit(ksocknal_module_fini);

drivers/staging/lustre/lnet/lnet/module.c

+3 −1
Original line number Diff line number Diff line
@@ -149,5 +149,7 @@ fini_lnet(void) 
MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");

MODULE_DESCRIPTION("Portals v3.1");

MODULE_LICENSE("GPL");

MODULE_VERSION("1.0.0");



cfs_module(lnet, "1.0.0", init_lnet, fini_lnet);
 
module_init(init_lnet);

module_exit(fini_lnet);

drivers/staging/lustre/lnet/selftest/module.c

+3 −1
Original line number Diff line number Diff line
@@ -165,5 +165,7 @@ lnet_selftest_init(void) 


MODULE_DESCRIPTION("LNet Selftest");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.9.0");



cfs_module(lnet, "0.9.0", lnet_selftest_init, lnet_selftest_fini);
 
module_init(lnet_selftest_init);

module_exit(lnet_selftest_fini);

drivers/staging/lustre/lustre/fid/fid_request.c

+3 −1
Original line number Diff line number Diff line
@@ -564,5 +564,7 @@ static void __exit fid_mod_exit(void) 
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");

MODULE_DESCRIPTION("Lustre FID Module");

MODULE_LICENSE("GPL");

MODULE_VERSION("0.1.0");



cfs_module(fid, "0.1.0", fid_mod_init, fid_mod_exit);
 
module_init(fid_mod_init);

module_exit(fid_mod_exit);