svn commit: r251682 - head/sys/sys

Lawrence Stewart lstewart at FreeBSD.org
Thu Jun 13 08:07:43 UTC 2013


Author: lstewart
Date: Thu Jun 13 08:07:42 2013
New Revision: 251682
URL: http://svnweb.freebsd.org/changeset/base/251682

Log:
  Remove some duplicate code by making KHELP_DECLARE_MOD() a wrapper around
  KHELP_DECLARE_MOD_UMA().
  
  MFC after:	3 days

Modified:
  head/sys/sys/module_khelp.h

Modified: head/sys/sys/module_khelp.h
==============================================================================
--- head/sys/sys/module_khelp.h	Thu Jun 13 06:07:19 2013	(r251681)
+++ head/sys/sys/module_khelp.h	Thu Jun 13 08:07:42 2013	(r251682)
@@ -70,22 +70,6 @@ struct khelp_modevent_data {
 	uma_dtor		umadtor;
 };
 
-#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
-	static struct khelp_modevent_data kmd_##hname = {		\
-		.name = #hname,						\
-		.helper = hdata						\
-		.hooks = hhooks,					\
-		.nhooks = sizeof(hhooks) / sizeof(hhooks[0]),		\
-	};								\
-	static moduledata_t h_##hname = {				\
-		.name = #hname,						\
-		.evhand = khelp_modevent,				\
-		.priv = &kmd_##hname					\
-	};								\
-	DECLARE_MODULE(hname, h_##hname, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-	    SI_ORDER_ANY);						\
-	MODULE_VERSION(hname, version)
-
 #define	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, size, ctor, dtor) \
 	static struct khelp_modevent_data kmd_##hname = {		\
 		.name = #hname,						\
@@ -105,6 +89,9 @@ struct khelp_modevent_data {
 	    SI_ORDER_ANY);						\
 	MODULE_VERSION(hname, version)
 
+#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
+	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, 0, NULL, NULL)
+
 int	khelp_modevent(module_t mod, int type, void *data);
 
 #endif /* _SYS_MODULE_KHELP_H_ */


More information about the svn-src-head mailing list