Index: stand/common/md.c
===================================================================
--- stand/common/md.c
+++ stand/common/md.c
@@ -74,6 +74,7 @@
 	.dv_close = md_close,
 	.dv_ioctl = noioctl,
 	.dv_print = md_print,
+	.dv_cleanup = nullsys,
 };
 
 static int
Index: stand/common/vdisk.c
===================================================================
--- stand/common/vdisk.c
+++ stand/common/vdisk.c
@@ -52,7 +52,7 @@
 	.dv_close = vdisk_close,
 	.dv_ioctl = vdisk_ioctl,
 	.dv_print = vdisk_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 typedef STAILQ_HEAD(vdisk_info_list, vdisk_info) vdisk_info_list_t;
Index: stand/efi/libefi/efihttp.c
===================================================================
--- stand/efi/libefi/efihttp.c
+++ stand/efi/libefi/efihttp.c
@@ -94,7 +94,7 @@
 	.dv_close =	efihttp_dev_close,
 	.dv_ioctl =	noioctl,
 	.dv_print =	NULL,
-	.dv_cleanup =	NULL,
+	.dv_cleanup =	nullsys,
 };
 
 struct fs_ops efihttp_fsops = {
Index: stand/efi/libefi/efinet.c
===================================================================
--- stand/efi/libefi/efinet.c
+++ stand/efi/libefi/efinet.c
@@ -351,7 +351,7 @@
 	.dv_close = NULL,		/* Will be set in efinet_dev_init */
 	.dv_ioctl = noioctl,
 	.dv_print = efinet_dev_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 static int
Index: stand/efi/libefi/efipart.c
===================================================================
--- stand/efi/libefi/efipart.c
+++ stand/efi/libefi/efipart.c
@@ -78,7 +78,7 @@
 	.dv_close = efipart_close,
 	.dv_ioctl = efipart_ioctl,
 	.dv_print = efipart_printfd,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 struct devsw efipart_cddev = {
@@ -90,7 +90,7 @@
 	.dv_close = efipart_close,
 	.dv_ioctl = efipart_ioctl,
 	.dv_print = efipart_printcd,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 struct devsw efipart_hddev = {
@@ -102,7 +102,7 @@
 	.dv_close = efipart_close,
 	.dv_ioctl = efipart_ioctl,
 	.dv_print = efipart_printhd,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 static pdinfo_list_t fdinfo = STAILQ_HEAD_INITIALIZER(fdinfo);
Index: stand/i386/libi386/biosdisk.c
===================================================================
--- stand/i386/libi386/biosdisk.c
+++ stand/i386/libi386/biosdisk.c
@@ -165,7 +165,7 @@
 	.dv_close = bd_close,
 	.dv_ioctl = bd_ioctl,
 	.dv_print = fd_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 struct devsw bioscd = {
@@ -177,7 +177,7 @@
 	.dv_close = bd_close,
 	.dv_ioctl = bd_ioctl,
 	.dv_print = cd_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 struct devsw bioshd = {
@@ -189,7 +189,7 @@
 	.dv_close = bd_close,
 	.dv_ioctl = bd_ioctl,
 	.dv_print = bd_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 static bdinfo_list_t *
Index: stand/i386/libi386/pxe.c
===================================================================
--- stand/i386/libi386/pxe.c
+++ stand/i386/libi386/pxe.c
@@ -119,7 +119,7 @@
 	.dv_close = NULL,	/* Will be set in pxe_init */
 	.dv_ioctl = noioctl,
 	.dv_print = pxe_print,
-	.dv_cleanup = pxe_cleanup
+	.dv_cleanup = pxe_cleanup,
 };
 
 /*
Index: stand/kboot/hostdisk.c
===================================================================
--- stand/kboot/hostdisk.c
+++ stand/kboot/hostdisk.c
@@ -48,6 +48,7 @@
 	.dv_close = hostdisk_close,
 	.dv_ioctl = hostdisk_ioctl,
 	.dv_print = hostdisk_print,
+	.dv_cleanup = nullsys,
 };
 
 static int
Index: stand/libofw/ofw_disk.c
===================================================================
--- stand/libofw/ofw_disk.c
+++ stand/libofw/ofw_disk.c
@@ -59,6 +59,7 @@
 	.dv_close = ofwd_close,
 	.dv_ioctl = ofwd_ioctl,
 	.dv_print = ofwd_print,
+	.dv_cleanup = nullsys,
 };
 
 /*
Index: stand/libsa/zfs/zfs.c
===================================================================
--- stand/libsa/zfs/zfs.c
+++ stand/libsa/zfs/zfs.c
@@ -1633,7 +1633,7 @@
 	.dv_close = zfs_dev_close,
 	.dv_ioctl = noioctl,
 	.dv_print = zfs_dev_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };
 
 int
Index: stand/userboot/userboot/host.c
===================================================================
--- stand/userboot/userboot/host.c
+++ stand/userboot/userboot/host.c
@@ -174,5 +174,5 @@
 	.dv_close = host_dev_close,
 	.dv_ioctl = noioctl,
 	.dv_print = host_dev_print,
-	.dv_cleanup = NULL
+	.dv_cleanup = nullsys,
 };