diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index dd2506de29..be5ad46b67 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2012-2013 Intel Corporation
  * All rights reserved.
@@ -27,7 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/bio.h>
 #include <sys/conf.h>
@@ -46,7 +45,6 @@
 #include "nvme_private.h"
 
 struct nvme_io_test_thread {
-
 	uint32_t		idx;
 	struct nvme_namespace	*ns;
 	enum nvme_nvm_opcode	opc;
@@ -58,7 +56,6 @@ struct nvme_io_test_thread {
 };
 
 struct nvme_io_test_internal {
-
 	struct nvme_namespace	*ns;
 	enum nvme_nvm_opcode	opc;
 	struct timeval		start;
@@ -102,7 +99,6 @@ nvme_ns_bio_test(void *arg)
 	offset = idx * 2048ULL * nvme_ns_get_sector_size(io_test->ns);
 
 	while (1) {
-
 		bio = g_alloc_bio();
 
 		memset(bio, 0, sizeof(*bio));
diff --git a/sys/dev/nvme/nvme_util.c b/sys/dev/nvme/nvme_util.c
index 7c95ee53ba..f54f3cf0a8 100644
--- a/sys/dev/nvme/nvme_util.c
+++ b/sys/dev/nvme/nvme_util.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013 Intel Corporation
  * Copyright (C) 1997 Justin T. Gibbs
@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <dev/nvme/nvme.h>
 
@@ -59,4 +58,3 @@ nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen)
 	}
 	*dst = '\0';
 }
-