diff options
79 files changed, 89 insertions, 88 deletions
diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c index 743f34b..684f58d 100644 --- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c +++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c @@ -163,7 +163,7 @@ load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "dyn_sysctl", load, - NULL + 0 }; DECLARE_MODULE(dyn_sysctl, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c index 421dcc6..6a51737 100644 --- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c +++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c @@ -71,7 +71,7 @@ fw_consumer_modevent(module_t mod, int type, void *unused) static moduledata_t fw_consumer_mod = { "fw_consumer", fw_consumer_modevent, - NULL + 0 }; DECLARE_MODULE(fw_consumer, fw_consumer_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(fw_consumer, 1); diff --git a/share/man/man9/module.9 b/share/man/man9/module.9 index bd072a9..055dab9 100644 --- a/share/man/man9/module.9 +++ b/share/man/man9/module.9 @@ -99,7 +99,7 @@ static int foo_handler(module_t mod, int /*modeventtype_t*/ what, static moduledata_t mod_data= { "foo", foo_handler, - NULL + 0 }; MODULE_VERSION(foo, 1); diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index c2043f6..5afc9ce 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -1198,7 +1198,7 @@ linux_elf_modevent(module_t mod, int type, void *data) static moduledata_t linux_elf_mod = { "linuxelf", linux_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 152f85b..1b4cb78 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -5526,7 +5526,7 @@ zfs_modevent(module_t mod, int type, void *unused __unused) static moduledata_t zfs_mod = { "zfsctrl", zfs_modevent, - NULL + 0 }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c index 76c0e29..561a838 100644 --- a/sys/compat/svr4/svr4_sysvec.c +++ b/sys/compat/svr4/svr4_sysvec.c @@ -308,7 +308,7 @@ svr4_elf_modevent(module_t mod, int type, void *data) static moduledata_t svr4_elf_mod = { "svr4elf", svr4_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(svr4elf, svr4_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); MODULE_DEPEND(svr4elf, streams, 1, 1, 1); diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 709c613b..6dcb821 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -275,7 +275,7 @@ ipf_modunload() static moduledata_t ipfiltermod = { "ipfilter", ipfilter_modevent, - NULL + 0 }; diff --git a/sys/contrib/rdma/rdma_addr.c b/sys/contrib/rdma/rdma_addr.c index 4d43e4b..b1717c0 100644 --- a/sys/contrib/rdma/rdma_addr.c +++ b/sys/contrib/rdma/rdma_addr.c @@ -407,7 +407,7 @@ addr_load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "rdma_addr", addr_load, - NULL + 0 }; MODULE_VERSION(rdma_addr, 1); diff --git a/sys/contrib/rdma/rdma_cma.c b/sys/contrib/rdma/rdma_cma.c index 0806094..ea3d501 100644 --- a/sys/contrib/rdma/rdma_cma.c +++ b/sys/contrib/rdma/rdma_cma.c @@ -2990,7 +2990,7 @@ cma_load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "rdma_cma", cma_load, - NULL + 0 }; MODULE_VERSION(rdma_cma, 1); diff --git a/sys/contrib/rdma/rdma_device.c b/sys/contrib/rdma/rdma_device.c index a96aa68..53cf31f 100644 --- a/sys/contrib/rdma/rdma_device.c +++ b/sys/contrib/rdma/rdma_device.c @@ -769,7 +769,7 @@ rdma_core_load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "rdma_core", rdma_core_load, - NULL + 0 }; MODULE_VERSION(rdma_core, 1); diff --git a/sys/contrib/rdma/rdma_iwcm.c b/sys/contrib/rdma/rdma_iwcm.c index a20bf95..916abcd 100644 --- a/sys/contrib/rdma/rdma_iwcm.c +++ b/sys/contrib/rdma/rdma_iwcm.c @@ -1078,7 +1078,7 @@ iw_cm_load(module_t mod, int cmd, void *arg) static moduledata_t mod_data = { "rdma_iwcm", iw_cm_load, - NULL + 0 }; MODULE_VERSION(rdma_iwcm, 1); diff --git a/sys/crypto/rc4/rc4.c b/sys/crypto/rc4/rc4.c index c2d5f96..dbdbd7a 100644 --- a/sys/crypto/rc4/rc4.c +++ b/sys/crypto/rc4/rc4.c @@ -122,7 +122,7 @@ rc4_modevent(module_t mod, int type, void *unused) static moduledata_t rc4_mod = { "rc4", rc4_modevent, - NULL + 0 }; DECLARE_MODULE(rc4, rc4_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(rc4, 1); diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c index e4e5487..77c5971 100644 --- a/sys/dev/bktr/bktr_mem.c +++ b/sys/dev/bktr/bktr_mem.c @@ -182,7 +182,7 @@ bktr_retrieve_address(int unit, int type) static moduledata_t bktr_mem_mod = { "bktr_mem", bktr_mem_modevent, - NULL + 0 }; /* diff --git a/sys/dev/cxgb/cxgb_t3fw.c b/sys/dev/cxgb/cxgb_t3fw.c index fcfb5de..44a4103 100644 --- a/sys/dev/cxgb/cxgb_t3fw.c +++ b/sys/dev/cxgb/cxgb_t3fw.c @@ -43,7 +43,7 @@ cxgb_t3fw_modevent(module_t mod, int type, void *unused) static moduledata_t cxgb_t3fw_mod = { "cxgb_t3fw", cxgb_t3fw_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3fw, cxgb_t3fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3fw, 1); @@ -76,7 +76,7 @@ cxgb_t3b_protocol_sram_modevent(module_t mod, int type, void *unused) static moduledata_t cxgb_t3b_protocol_sram_mod = { "cxgb_t3b_protocol_sram", cxgb_t3b_protocol_sram_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3b_protocol_sram, cxgb_t3b_protocol_sram_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3b_protocol_sram, 1); @@ -109,7 +109,7 @@ cxgb_t3b_tp_eeprom_modevent(module_t mod, int type, void *unused) static moduledata_t cxgb_t3b_tp_eeprom_mod = { "cxgb_t3b_tp_eeprom", cxgb_t3b_tp_eeprom_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3b_tp_eeprom, cxgb_t3b_tp_eeprom_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3b_tp_eeprom, 1); @@ -142,7 +142,7 @@ cxgb_t3c_protocol_sram_modevent(module_t mod, int type, void *unused) static moduledata_t cxgb_t3c_protocol_sram_mod = { "cxgb_t3c_protocol_sram", cxgb_t3c_protocol_sram_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3c_protocol_sram, cxgb_t3c_protocol_sram_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3c_protocol_sram, 1); @@ -175,7 +175,7 @@ cxgb_t3c_tp_eeprom_modevent(module_t mod, int type, void *unused) static moduledata_t cxgb_t3c_tp_eeprom_mod = { "cxgb_t3c_tp_eeprom", cxgb_t3c_tp_eeprom_modevent, - NULL + 0 }; DECLARE_MODULE(cxgb_t3c_tp_eeprom, cxgb_t3c_tp_eeprom_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(cxgb_t3c_tp_eeprom, 1); diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c index cbdb130..c8652a0 100644 --- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c +++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c @@ -290,7 +290,7 @@ iwch_modevent(module_t mod, int cmd, void *arg) static moduledata_t iwch_mod_data = { "iw_cxgb", iwch_modevent, - NULL + 0 }; MODULE_VERSION(iw_cxgb, 1); diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom.c b/sys/dev/cxgb/ulp/tom/cxgb_tom.c index bd70b06..8f0dd25 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_tom.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_tom.c @@ -387,7 +387,7 @@ t3_tom_modevent(module_t mod, int cmd, void *arg) static moduledata_t t3_tom_moddata= { "t3_tom", t3_tom_modevent, - NULL + 0 }; MODULE_VERSION(t3_tom, 1); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 5d47ad3..330172d 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -768,7 +768,7 @@ t4_tom_modevent(module_t mod, int cmd, void *arg) static moduledata_t t4_tom_moddata= { "t4_tom", t4_tom_modevent, - NULL + 0 }; MODULE_VERSION(t4_tom, 1); diff --git a/sys/dev/drm2/drm_drv.c b/sys/dev/drm2/drm_drv.c index efffcbb..33e50ea 100644 --- a/sys/dev/drm2/drm_drv.c +++ b/sys/dev/drm2/drm_drv.c @@ -74,7 +74,7 @@ drm_modevent(module_t mod, int type, void *data) static moduledata_t drm_mod = { "drmn", drm_modevent, - NULL + 0 }; DECLARE_MODULE(drmn, drm_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(drmn, 1); diff --git a/sys/dev/iscsi/initiator/iscsi.c b/sys/dev/iscsi/initiator/iscsi.c index 899501a..a93a685 100644 --- a/sys/dev/iscsi/initiator/iscsi.c +++ b/sys/dev/iscsi/initiator/iscsi.c @@ -855,9 +855,9 @@ iscsi_modevent(module_t mod, int what, void *arg) } moduledata_t iscsi_mod = { - "iscsi", - (modeventhand_t) iscsi_modevent, - NULL + "iscsi", + (modeventhand_t) iscsi_modevent, + 0 }; #ifdef ISCSI_ROOT diff --git a/sys/dev/mxge/mxge_eth_z8e.c b/sys/dev/mxge/mxge_eth_z8e.c index 497fd3b..570f654 100644 --- a/sys/dev/mxge/mxge_eth_z8e.c +++ b/sys/dev/mxge/mxge_eth_z8e.c @@ -39,7 +39,7 @@ mxge_eth_z8e_fw_modevent(module_t mod, int type, void *unused) static moduledata_t mxge_eth_z8e_fw_mod = { "mxge_eth_z8e_fw", mxge_eth_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_eth_z8e_fw, mxge_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_eth_z8e_fw, 1); diff --git a/sys/dev/mxge/mxge_ethp_z8e.c b/sys/dev/mxge/mxge_ethp_z8e.c index d41a080..8d0e31b 100644 --- a/sys/dev/mxge/mxge_ethp_z8e.c +++ b/sys/dev/mxge/mxge_ethp_z8e.c @@ -39,7 +39,7 @@ mxge_ethp_z8e_fw_modevent(module_t mod, int type, void *unused) static moduledata_t mxge_ethp_z8e_fw_mod = { "mxge_ethp_z8e_fw", mxge_ethp_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_ethp_z8e_fw, mxge_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_ethp_z8e_fw, 1); diff --git a/sys/dev/mxge/mxge_rss_eth_z8e.c b/sys/dev/mxge/mxge_rss_eth_z8e.c index d41ab4a..d31907a 100644 --- a/sys/dev/mxge/mxge_rss_eth_z8e.c +++ b/sys/dev/mxge/mxge_rss_eth_z8e.c @@ -39,7 +39,7 @@ mxge_rss_eth_z8e_fw_modevent(module_t mod, int type, void *unused) static moduledata_t mxge_rss_eth_z8e_fw_mod = { "mxge_rss_eth_z8e_fw", mxge_rss_eth_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_rss_eth_z8e_fw, mxge_rss_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_eth_z8e_fw, 1); diff --git a/sys/dev/mxge/mxge_rss_ethp_z8e.c b/sys/dev/mxge/mxge_rss_ethp_z8e.c index 84cfe23..ca7be0e 100644 --- a/sys/dev/mxge/mxge_rss_ethp_z8e.c +++ b/sys/dev/mxge/mxge_rss_ethp_z8e.c @@ -39,7 +39,7 @@ mxge_rss_ethp_z8e_fw_modevent(module_t mod, int type, void *unused) static moduledata_t mxge_rss_ethp_z8e_fw_mod = { "mxge_rss_ethp_z8e_fw", mxge_rss_ethp_z8e_fw_modevent, - NULL + 0 }; DECLARE_MODULE(mxge_rss_ethp_z8e_fw, mxge_rss_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_ethp_z8e_fw, 1); diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 11239ef..2017d79 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -93,7 +93,7 @@ static int nvd_modevent(module_t mod, int type, void *arg) moduledata_t nvd_mod = { "nvd", (modeventhand_t)nvd_modevent, - NULL + 0 }; DECLARE_MODULE(nvd, nvd_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index 350e04a..edc536e 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -177,7 +177,7 @@ nvme_modevent(module_t mod, int type, void *arg) moduledata_t nvme_mod = { "nvme", (modeventhand_t)nvme_modevent, - NULL + 0 }; DECLARE_MODULE(nvme, nvme_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c index 1803e0d..4e42aa8 100644 --- a/sys/dev/rndtest/rndtest.c +++ b/sys/dev/rndtest/rndtest.c @@ -402,7 +402,7 @@ rndtest_modevent(module_t mod, int type, void *unused) static moduledata_t rndtest_mod = { "rndtest", rndtest_modevent, - NULL + 0 }; DECLARE_MODULE(rndtest, rndtest_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(rndtest, 1); diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index 73be7ff..ad2817f 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -171,7 +171,7 @@ streams_modevent(module_t mod, int type, void *unused) static moduledata_t streams_mod = { "streams", streams_modevent, - NULL + 0 }; DECLARE_MODULE(streams, streams_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(streams, 1); diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c index e3d2197..0b769f0 100644 --- a/sys/dev/tdfx/tdfx_linux.c +++ b/sys/dev/tdfx/tdfx_linux.c @@ -78,7 +78,7 @@ tdfx_linux_modevent(struct module *mod __unused, int what, void *arg __unused) static moduledata_t tdfx_linux_mod = { "tdfx_linux", tdfx_linux_modevent, - NULL + 0 }; /* As in SYSCALL_MODULE */ diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 6857bac..2a7bddf 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -549,7 +549,7 @@ uether_modevent(module_t mod, int type, void *data) static moduledata_t uether_mod = { "uether", uether_modevent, - NULL + 0 }; struct mbuf * diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c index b9c68f3..a4e7331 100644 --- a/sys/dev/utopia/utopia.c +++ b/sys/dev/utopia/utopia.c @@ -668,7 +668,7 @@ utopia_mod_init(module_t mod, int what, void *arg) static moduledata_t utopia_mod = { "utopia", utopia_mod_init, - NULL + 0 }; DECLARE_MODULE(utopia, utopia_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c index bd893a2..1cac3c7 100644 --- a/sys/dev/virtio/virtio.c +++ b/sys/dev/virtio/virtio.c @@ -269,7 +269,7 @@ virtio_modevent(module_t mod, int type, void *unused) static moduledata_t virtio_mod = { "virtio", virtio_modevent, - NULL + 0 }; DECLARE_MODULE(virtio, virtio_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c index 6a99bbc..5b6f680 100644 --- a/sys/i386/ibcs2/ibcs2_sysvec.c +++ b/sys/i386/ibcs2/ibcs2_sysvec.c @@ -133,6 +133,6 @@ ibcs2_modevent(module_t mod, int type, void *unused) static moduledata_t ibcs2_mod = { "ibcs2", ibcs2_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(ibcs2, ibcs2_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c index 11bf6ff..5fbfd36 100644 --- a/sys/i386/isa/elink.c +++ b/sys/i386/isa/elink.c @@ -87,7 +87,7 @@ elink_idseq(u_char p) static moduledata_t elink_mod = { "elink",/* module name */ NULL, /* event handler */ - NULL /* extra data */ + 0 /* extra data */ }; DECLARE_MODULE(elink, elink_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 39acb02..d4e23e1 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -1173,7 +1173,7 @@ linux_elf_modevent(module_t mod, int type, void *data) static moduledata_t linux_elf_mod = { "linuxelf", linux_elf_modevent, - NULL + 0 }; DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 79bae53..15d4ee9 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -2124,7 +2124,7 @@ bstp_modevent(module_t mod, int type, void *data) static moduledata_t bstp_mod = { "bridgestp", bstp_modevent, - NULL + 0 }; DECLARE_MODULE(bridgestp, bstp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index a2c35e4..03f3a1c 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -878,7 +878,7 @@ arc_modevent(module_t mod, int type, void *data) static moduledata_t arc_mod = { "arcnet", arc_modevent, - NULL + 0 }; DECLARE_MODULE(arcnet, arc_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 0ce1f1d..bb691e1 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -496,7 +496,7 @@ atm_modevent(module_t mod, int type, void *data) static moduledata_t atm_mod = { "atm", atm_modevent, - NULL + 0 }; DECLARE_MODULE(atm, atm_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 734e04a..5800831 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -523,7 +523,7 @@ bridge_modevent(module_t mod, int type, void *data) static moduledata_t bridge_mod = { "if_bridge", bridge_modevent, - NULL + 0 }; DECLARE_MODULE(if_bridge, bridge_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index add215f..efd3fc7 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -181,7 +181,7 @@ enc_modevent(module_t mod, int type, void *data) static moduledata_t enc_mod = { "if_enc", enc_modevent, - NULL + 0 }; DECLARE_MODULE(if_enc, enc_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index 90f2ea9..2a67e18 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -978,7 +978,7 @@ epair_modevent(module_t mod, int type, void *data) static moduledata_t epair_mod = { "if_epair", epair_modevent, - NULL + 0 }; DECLARE_MODULE(if_epair, epair_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 39413a5..ba47194 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1237,7 +1237,7 @@ ether_modevent(module_t mod, int type, void *data) static moduledata_t ether_mod = { "ether", ether_modevent, - NULL + 0 }; void diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c index 40289a8..db4c1d9 100644 --- a/sys/net/if_faith.c +++ b/sys/net/if_faith.c @@ -136,7 +136,7 @@ faithmodevent(mod, type, data) static moduledata_t faith_mod = { "if_faith", faithmodevent, - NULL + 0 }; DECLARE_MODULE(if_faith, faith_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 2b59f3a..d98029c 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -792,7 +792,7 @@ fddi_resolvemulti(ifp, llsa, sa) static moduledata_t fddi_mod = { "fddi", /* module name */ NULL, /* event handler */ - NULL /* extra data */ + 0 /* extra data */ }; DECLARE_MODULE(fddi, fddi_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 9e996cc..5414d79 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -845,7 +845,7 @@ firewire_modevent(module_t mod, int type, void *data) static moduledata_t firewire_mod = { "if_firewire", firewire_modevent, - NULL + 0 }; DECLARE_MODULE(if_firewire, firewire_mod, SI_SUB_INIT_IF, SI_ORDER_ANY); diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 19906c7..783607b 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -272,7 +272,7 @@ gifmodevent(mod, type, data) static moduledata_t gif_mod = { "if_gif", gifmodevent, - NULL + 0 }; DECLARE_MODULE(if_gif, gif_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index e7905ea..8b250d7 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -973,7 +973,7 @@ gremodevent(module_t mod, int type, void *data) static moduledata_t gre_mod = { "if_gre", gremodevent, - NULL + 0 }; DECLARE_MODULE(if_gre, gre_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 1e251e4..91d67fd 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -823,7 +823,7 @@ iso88025_modevent(module_t mod, int type, void *data) static moduledata_t iso88025_mod = { "iso88025", iso88025_modevent, - NULL + 0 }; DECLARE_MODULE(iso88025, iso88025_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 5179306..e567e8e 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -211,7 +211,7 @@ lagg_modevent(module_t mod, int type, void *data) static moduledata_t lagg_mod = { "if_lagg", lagg_modevent, - NULL + 0 }; DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 31cda71..2850b38 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -205,7 +205,7 @@ loop_modevent(module_t mod, int type, void *data) static moduledata_t loop_mod = { "if_lo", loop_modevent, - NULL + 0 }; DECLARE_MODULE(if_lo, loop_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 0352f10..7c9c230 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -494,7 +494,7 @@ sppp_modevent(module_t mod, int type, void *unused) static moduledata_t spppmod = { "sppp", sppp_modevent, - NULL + 0 }; MODULE_VERSION(sppp, 1); DECLARE_MODULE(sppp, spppmod, SI_SUB_DRIVERS, SI_ORDER_ANY); diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 863973f..b19c855 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -301,7 +301,7 @@ stfmodevent(mod, type, data) static moduledata_t stf_mod = { "if_stf", stfmodevent, - NULL + 0 }; DECLARE_MODULE(if_stf, stf_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index b2070ef..74e1d22 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -317,7 +317,7 @@ tunmodevent(module_t mod, int type, void *data) static moduledata_t tun_mod = { "if_tun", tunmodevent, - NULL + 0 }; DECLARE_MODULE(if_tun, tun_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index d76fbdc..3bc3b67 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -762,7 +762,7 @@ vlan_modevent(module_t mod, int type, void *data) static moduledata_t vlan_mod = { "if_vlan", vlan_modevent, - NULL + 0 }; DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/net/zlib.c b/sys/net/zlib.c index c7bbb95..8fc8cab 100644 --- a/sys/net/zlib.c +++ b/sys/net/zlib.c @@ -5400,7 +5400,7 @@ zlib_modevent(module_t mod, int type, void *unused) static moduledata_t zlib_mod = { "zlib", zlib_modevent, - NULL + 0 }; DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(zlib, 1); diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index 844910f..b733d2f 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -822,7 +822,7 @@ wlan_modevent(module_t mod, int type, void *unused) static moduledata_t wlan_mod = { "wlan", wlan_modevent, - NULL + 0 }; DECLARE_MODULE(wlan, wlan_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(wlan, 1); diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index af5f1fa..abfc2c0 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -323,7 +323,7 @@ wlan_##name##_modevent(module_t mod, int type, void *unused) \ static moduledata_t name##_mod = { \ "wlan_" #name, \ wlan_##name##_modevent, \ - NULL \ + 0 \ }; \ DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ MODULE_VERSION(wlan_##name, version); \ diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 1919f30..c5b0ced 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -51,7 +51,7 @@ static int ngatm_handler(module_t, int, void *); static moduledata_t ngatm_data = { "ngatmbase", ngatm_handler, - NULL + 0 }; MODULE_VERSION(ngatmbase, NGATMBASE_VERSION); diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index ececf2d..94c00a1 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3644,6 +3644,6 @@ igmp_modevent(module_t mod, int type, void *unused __unused) static moduledata_t igmp_mod = { "igmp", igmp_modevent, - NULL + 0 }; DECLARE_MODULE(igmp, igmp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index d6c9b01..a5e766a 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2145,7 +2145,7 @@ carp_modevent(module_t mod, int type, void *data) static moduledata_t carp_mod = { "carp", carp_modevent, - NULL + 0 }; DECLARE_MODULE(carp, carp_mod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 07fb9b0..4f5f1b3 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -834,7 +834,7 @@ div_modevent(module_t mod, int type, void *unused) static moduledata_t ipdivertmod = { "ipdivert", div_modevent, - NULL + 0 }; DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 425fe3f..c52332d 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -2944,7 +2944,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) static moduledata_t ip_mroutemod = { "ip_mroute", ip_mroute_modevent, - NULL + 0 }; DECLARE_MODULE(ip_mroute, ip_mroutemod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE); diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c index c38018f..7e498dd 100644 --- a/sys/netinet/toecore.c +++ b/sys/netinet/toecore.c @@ -570,7 +570,7 @@ toecore_mod_handler(module_t mod, int cmd, void *arg) static moduledata_t mod_data= { "toecore", toecore_mod_handler, - NULL + 0 }; MODULE_VERSION(toecore, 1); diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 2555b92..8ecd60e 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -2059,7 +2059,7 @@ ip6_mroute_modevent(module_t mod, int type, void *unused) static moduledata_t ip6_mroutemod = { "ip6_mroute", ip6_mroute_modevent, - NULL + 0 }; DECLARE_MODULE(ip6_mroute, ip6_mroutemod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 9d8bc8d..ba850b2 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -3309,6 +3309,6 @@ mld_modevent(module_t mod, int type, void *unused __unused) static moduledata_t mld_mod = { "mld", mld_modevent, - NULL + 0 }; DECLARE_MODULE(mld, mld_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/netinet6/send.c b/sys/netinet6/send.c index 09fe586..5624366 100644 --- a/sys/netinet6/send.c +++ b/sys/netinet6/send.c @@ -361,7 +361,7 @@ send_modevent(module_t mod, int type, void *unused) static moduledata_t sendmod = { "send", send_modevent, - NULL + 0 }; DECLARE_MODULE(send, sendmod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 8ac2fa8..e43a0ef 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -2756,7 +2756,7 @@ ipfw_modevent(module_t mod, int type, void *unused) static moduledata_t ipfwmod = { "ipfw", ipfw_modevent, - NULL + 0 }; /* Define startup order. */ diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index b2800fc..94861b3 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -651,7 +651,7 @@ ipfw_nat_modevent(module_t mod, int type, void *unused) static moduledata_t ipfw_nat_mod = { "ipfw_nat", ipfw_nat_modevent, - NULL + 0 }; DECLARE_MODULE(ipfw_nat, ipfw_nat_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 9bd9ca8..20feea2 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -281,7 +281,7 @@ pflog_modevent(module_t mod, int type, void *data) return error; } -static moduledata_t pflog_mod = { "pflog", pflog_modevent, NULL }; +static moduledata_t pflog_mod = { "pflog", pflog_modevent, 0 }; #define PFLOG_MODVER 1 diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 9267e28..505d9a7 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2402,7 +2402,7 @@ pfsync_modevent(module_t mod, int type, void *data) static moduledata_t pfsync_mod = { "pfsync", pfsync_modevent, - NULL + 0 }; #define PFSYNC_MODVER 1 diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 35b6d29..a8b71d5 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -3722,7 +3722,7 @@ pf_modevent(module_t mod, int type, void *data) static moduledata_t pf_mod = { "pf", pf_modevent, - NULL + 0 }; DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); diff --git a/sys/nfs/nfs_nfssvc.c b/sys/nfs/nfs_nfssvc.c index 929aa6a..9680eb7 100644 --- a/sys/nfs/nfs_nfssvc.c +++ b/sys/nfs/nfs_nfssvc.c @@ -147,7 +147,7 @@ nfssvc_modevent(module_t mod, int type, void *data) static moduledata_t nfssvc_mod = { "nfssvc", nfssvc_modevent, - NULL + NULL, }; DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDER_ANY); diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 33a7edb..66a85c4 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -552,7 +552,7 @@ nfsrv_modevent(module_t mod, int type, void *data) static moduledata_t nfsserver_mod = { "nfsserver", nfsrv_modevent, - NULL + NULL, }; DECLARE_MODULE(nfsserver, nfsserver_mod, SI_SUB_VFS, SI_ORDER_ANY); diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 01357a5..2bc0e1f 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -1171,7 +1171,7 @@ cryptodev_modevent(module_t mod, int type, void *unused) static moduledata_t cryptodev_mod = { "cryptodev", cryptodev_modevent, - NULL + 0 }; MODULE_VERSION(cryptodev, 1); DECLARE_MODULE(cryptodev, cryptodev_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk index 82ca821..0c7d567 100644 --- a/sys/tools/fw_stub.awk +++ b/sys/tools/fw_stub.awk @@ -215,7 +215,7 @@ printc("\t\treturn (error);\ static moduledata_t " modname "_fw_mod = {\ \"" modname "_fw\",\ " modname "_fw_modevent,\ - NULL\ + 0\ };\ DECLARE_MODULE(" modname "_fw, " modname "_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ MODULE_VERSION(" modname "_fw, 1);\ diff --git a/tools/regression/kthread/kld/kthrdlk.c b/tools/regression/kthread/kld/kthrdlk.c index a64dc2e..67825b6 100644 --- a/tools/regression/kthread/kld/kthrdlk.c +++ b/tools/regression/kthread/kld/kthrdlk.c @@ -193,11 +193,12 @@ kthrdlk_handler(module_t mod, int /*modeventtype_t*/ what, } static moduledata_t mod_data= { - "kthrdlk", - kthrdlk_handler, - NULL -}; + "kthrdlk", + kthrdlk_handler, + 0 + }; MODULE_VERSION(kthrdlk, 1); DECLARE_MODULE(kthrdlk, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); + diff --git a/tools/regression/net80211/ccmp/test_ccmp.c b/tools/regression/net80211/ccmp/test_ccmp.c index da13ac7..d78be95 100644 --- a/tools/regression/net80211/ccmp/test_ccmp.c +++ b/tools/regression/net80211/ccmp/test_ccmp.c @@ -742,7 +742,7 @@ test_ccmp_modevent(module_t mod, int type, void *unused) static moduledata_t test_ccmp_mod = { "test_ccmp", test_ccmp_modevent, - NULL + 0 }; DECLARE_MODULE(test_ccmp, test_ccmp_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_ccmp, 1); diff --git a/tools/regression/net80211/tkip/test_tkip.c b/tools/regression/net80211/tkip/test_tkip.c index 3909bbd..5a63978 100644 --- a/tools/regression/net80211/tkip/test_tkip.c +++ b/tools/regression/net80211/tkip/test_tkip.c @@ -381,7 +381,7 @@ test_tkip_modevent(module_t mod, int type, void *unused) static moduledata_t test_tkip_mod = { "test_tkip", test_tkip_modevent, - NULL + 0 }; DECLARE_MODULE(test_tkip, test_tkip_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_tkip, 1); diff --git a/tools/regression/net80211/wep/test_wep.c b/tools/regression/net80211/wep/test_wep.c index 04bd054..b498195 100644 --- a/tools/regression/net80211/wep/test_wep.c +++ b/tools/regression/net80211/wep/test_wep.c @@ -328,7 +328,7 @@ test_wep_modevent(module_t mod, int type, void *unused) static moduledata_t test_wep_mod = { "test_wep", test_wep_modevent, - NULL + 0 }; DECLARE_MODULE(test_wep, test_wep_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(test_wep, 1); diff --git a/tools/tools/kttcp/sys/kttcp.c b/tools/tools/kttcp/sys/kttcp.c index dbaa9fc..0973960 100644 --- a/tools/tools/kttcp/sys/kttcp.c +++ b/tools/tools/kttcp/sys/kttcp.c @@ -268,7 +268,7 @@ kttcpdev_modevent(module_t mod, int type, void *unused) static moduledata_t kttcpdev_mod = { "kttcpdev", kttcpdev_modevent, - NULL + 0 }; MODULE_VERSION(kttcpdev, 1); DECLARE_MODULE(kttcpdev, kttcpdev_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); |
