From 301b8a806f79292ee3324ca938a4d938df1911e8 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 25 Nov 2025 09:10:23 -0700
Subject: [PATCH] nvme: Minor style(9) fixes

<sys/systm.h> needs to be first after <sys/param.h>. And we don't need
both sys/param.h and sys/types.h.

Fixes:		032fbda024d78
Sponsored by:	Netflix
---
 sys/dev/nvme/nvme.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index 3de65a4a481..ddbc149802f 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -29,15 +29,13 @@
 #ifndef __NVME_H__
 #define __NVME_H__
 
-#ifdef _KERNEL
-#include <sys/types.h>
-#endif
-
 #include <sys/param.h>
-#include <sys/endian.h>
-#ifndef _KERNEL
+#ifdef _KERNEL
+#include <sys/systm.h>
+#else
 #include <stdbool.h>
 #endif
+#include <sys/endian.h>
 
 struct sbuf;
 
@@ -1909,7 +1907,6 @@ void	nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf);
 void	nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen);
 
 #ifdef _KERNEL
-#include <sys/systm.h>
 #include <sys/disk.h>
 
 struct bio;