move nvme_barrier to nvmevar.h, just to keep it with the other reg ops.

diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 8f48d73..29f98d1 100644 (file)
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: nvme.c,v 1.93 2021/05/28 01:54:43 dlg Exp $ */
+/*     $OpenBSD: nvme.c,v 1.94 2021/05/28 01:57:20 dlg Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -151,8 +151,6 @@ nvme_write8(struct nvme_softc *sc, bus_size_t r, u_int64_t v)
        nvme_write4(sc, r + 4, a[0]);
 #endif
 }
-#define nvme_barrier(_s, _r, _l, _f) \
-       bus_space_barrier((_s)->sc_iot, (_s)->sc_ioh, (_r), (_l), (_f))
 
 void
 nvme_dumpregs(struct nvme_softc *sc)

diff --git a/sys/dev/ic/nvmevar.h b/sys/dev/ic/nvmevar.h
index 2d31bdb..b2fefd7 100644 (file)
--- a/sys/dev/ic/nvmevar.h
+++ b/sys/dev/ic/nvmevar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: nvmevar.h,v 1.22 2021/05/28 01:54:43 dlg Exp $ */
+/*     $OpenBSD: nvmevar.h,v 1.23 2021/05/28 01:57:20 dlg Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -115,4 +115,7 @@ int nvme_intr_intx(void *);
 u_int64_t      nvme_read8(struct nvme_softc *, bus_size_t);
 void           nvme_write8(struct nvme_softc *, bus_size_t, u_int64_t);
 
+#define nvme_barrier(_s, _r, _l, _f) \
+       bus_space_barrier((_s)->sc_iot, (_s)->sc_ioh, (_r), (_l), (_f))
+
 #define DEVNAME(_sc) ((_sc)->sc_dev.dv_xname)