diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -1271,13 +1271,9 @@
 #error "no TARGETNAME found"
 #endif
 
-/* use this to make TARGETNAME be expanded */
-#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
-#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
-#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
-__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
-__MODULE_VERSION(TARGETNAME, 1);
-__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
+DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
+MODULE_VERSION(TARGETNAME, 1);
+MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -95,8 +95,7 @@
 	sizeof(IAL_ADAPTER_T)
 };
 
-#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
-__DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, 0, 0);
+DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, NULL, NULL);
 MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
 
 #define ccb_ccb_ptr spriv_ptr0
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -1561,13 +1561,9 @@
 #error "no TARGETNAME found"
 #endif
 
-/* use this to make TARGETNAME be expanded */
-#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
-#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
-#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
-__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
-__MODULE_VERSION(TARGETNAME, 1);
-__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
+DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
+MODULE_VERSION(TARGETNAME, 1);
+MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -1204,13 +1204,9 @@
 #error "no TARGETNAME found"
 #endif
 
-/* use this to make TARGETNAME be expanded */
-#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
-#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
-#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
-__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
-__MODULE_VERSION(TARGETNAME, 1);
-__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
+DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
+MODULE_VERSION(TARGETNAME, 1);
+MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {