Index: dev/ic/nvme.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/nvme.c,v
retrieving revision 1.97
diff -u -p -r1.97 nvme.c
--- dev/ic/nvme.c	29 May 2021 08:07:43 -0000	1.97
+++ dev/ic/nvme.c	31 May 2021 04:02:05 -0000
@@ -298,11 +298,11 @@ nvme_attach(struct nvme_softc *sc)
 
 	reg = nvme_read4(sc, NVME_VS);
 	if (reg == 0xffffffff) {
-		printf(", invalid mapping\n");
+		printf("invalid mapping\n");
 		return (1);
 	}
 
-	printf(", NVMe %d.%d\n", NVME_VS_MJR(reg), NVME_VS_MNR(reg));
+	printf("NVMe %d.%d\n", NVME_VS_MJR(reg), NVME_VS_MNR(reg));
 
 	cap = nvme_read8(sc, NVME_CAP);
 	sc->sc_dstrd = NVME_CAP_DSTRD(cap);
Index: dev/pci/nvme_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/nvme_pci.c,v
retrieving revision 1.8
diff -u -p -r1.8 nvme_pci.c
--- dev/pci/nvme_pci.c	27 Jun 2019 17:55:42 -0000	1.8
+++ dev/pci/nvme_pci.c	31 May 2021 04:02:05 -0000
@@ -95,20 +95,22 @@ nvme_pci_attach(struct device *parent, s
 	psc->psc_pc = pa->pa_pc;
 	sc->sc_dmat = pa->pa_dmat;
 
+	printf(": ");
+
 	if (pci_matchbyid(pa, nvme_msi_blacklist, nitems(nvme_msi_blacklist)))
 		CLR(pa->pa_flags, PCI_FLAGS_MSI_ENABLED);
 
 	maptype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NVME_PCI_BAR);
 	if (pci_mapreg_map(pa, NVME_PCI_BAR, maptype, 0,
 	    &sc->sc_iot, &sc->sc_ioh, NULL, &sc->sc_ios, 0) != 0) {
-		printf(": unable to map registers\n");
+		printf("unable to map registers\n");
 		return;
 	}
 
 	if (pci_intr_map_msix(pa, 0, &ih) != 0 &&
 	    pci_intr_map_msi(pa, &ih) != 0) {
 		if (pci_intr_map(pa, &ih) != 0) {
-			printf(": unable to map interrupt\n");
+			printf("unable to map interrupt\n");
 			goto unmap;
 		}
 		msi = 0;
@@ -117,11 +119,11 @@ nvme_pci_attach(struct device *parent, s
 	sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
 	    msi ? nvme_intr : nvme_intr_intx, sc, DEVNAME(sc));
 	if (sc->sc_ih == NULL) {
-		printf(": unable to establish interrupt\n");
+		printf("unable to establish interrupt\n");
 		goto unmap;
 	}
 
-	printf(": %s", pci_intr_string(pa->pa_pc, ih));
+	printf("%s, ", pci_intr_string(pa->pa_pc, ih));
 	if (nvme_attach(sc) != 0) {
 		/* error printed by nvme_attach() */
 		goto disestablish;
Index: arch/arm64/dev/aplns.c
===================================================================
RCS file: /cvs/src/sys/arch/arm64/dev/aplns.c,v
retrieving revision 1.3
diff -u -p -r1.3 aplns.c
--- arch/arm64/dev/aplns.c	29 May 2021 08:10:11 -0000	1.3
+++ arch/arm64/dev/aplns.c	31 May 2021 04:02:05 -0000
@@ -156,17 +156,19 @@ nvme_ans_attach(struct device *parent, s
 	struct nvme_softc *sc = &asc->asc_nvme;
 	struct fdt_attach_args *faa = aux;
 
+	printf(": ");
+
 	if (bus_space_map(faa->fa_iot,
 	    faa->fa_reg[0].addr, faa->fa_reg[0].size,
 	    0, &sc->sc_ioh) != 0) {
-		printf(": unable to map registers\n");
+		printf("unable to map registers\n");
 		return;
 	}
 
 	sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO,
 	    nvme_intr, sc, sc->sc_dev.dv_xname);
 	if (sc->sc_ih == NULL) {
-		printf(": unable to establish interrupt\n");
+		printf("unable to establish interrupt\n");
 		goto unmap;
 	}
 
@@ -175,8 +177,6 @@ nvme_ans_attach(struct device *parent, s
 	sc->sc_ios = faa->fa_reg[0].size;
 	sc->sc_ops = &nvme_ans_ops;
 
-
-	printf(":");
 	if (nvme_attach(sc) != 0) {
 		/* error printed by nvme_attach() */
 		goto disestablish;