diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index b0d78934b31..d41f31280ad 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -156,7 +156,7 @@ ata_attach(device_t dev)
 
     /* initialize queue and associated lock */
     bzero(&ch->queue_mtx, sizeof(struct mtx));
-    mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0);
+    mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF);
     TAILQ_INIT(&ch->ata_queue);
 
     /* do not attach devices if we are in early boot */
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index fe290150db3..859c864f3d3 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -1324,7 +1324,7 @@ ata_promise_chipinit(device_t dev)
 	    ctlr->driver = malloc(sizeof(struct ata_promise_sx4),
 				  M_TEMP, M_NOWAIT | M_ZERO);
 	    hpkt = ctlr->driver;
-	    mtx_init(&hpkt->mtx, "ATA promise HPKT lock", MTX_DEF, 0);
+	    mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF);
 	    hpkt->busy = hpkt->head = hpkt->tail = 0;
 
 	    if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS,
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 6ccd8bf46b2..c8d96b24542 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -97,7 +97,7 @@ ad_attach(struct ata_device *atadev)
 	adp->sectors = 17;
 	adp->heads = 8;
     }
-    mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", MTX_DEF, 0);
+    mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", NULL, MTX_DEF);
     bioq_init(&adp->queue);
 
     lbasize = (u_int32_t)atadev->param->lba_size_1 |
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 6599f1c9b1a..76597c9ce55 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -230,7 +230,7 @@ acd_init_lun(struct ata_device *atadev)
     if (!(cdp = malloc(sizeof(struct acd_softc), M_ACD, M_NOWAIT | M_ZERO)))
 	return NULL;
     bioq_init(&cdp->queue);
-    mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", MTX_DEF, 0);
+    mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", NULL, MTX_DEF);
     cdp->device = atadev;
     cdp->lun = ata_get_lun(&acd_lun_map);
     cdp->block_size = 2048;
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index e59f60ff524..eaf30662d69 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -82,7 +82,7 @@ afd_attach(struct ata_device *atadev)
     fdp->lun = ata_get_lun(&afd_lun_map);
     ata_set_name(atadev, "afd", fdp->lun);
     bioq_init(&fdp->queue);
-    mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", MTX_DEF, 0);  
+    mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", NULL, MTX_DEF);  
 
     if (afd_sense(fdp)) {
 	free(fdp, M_AFD);
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 19e6100cbcb..e6f794c92b2 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -106,7 +106,7 @@ ast_attach(struct ata_device *atadev)
     stp->lun = ata_get_lun(&ast_lun_map);
     ata_set_name(atadev, "ast", stp->lun);
     bioq_init(&stp->queue);
-    mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", MTX_DEF, 0);
+    mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", NULL, MTX_DEF);
 
     if (ast_sense(stp)) {
 	free(stp, M_AST);