- Use the __BUS_ACCESSOR macro for EISA_ACCESSOR instead

  of reimplementing it.
- #undef EISA_ACCESSOR after use like we do for other accessors.

Reviewed by:	tmm

1 files changed, 4 insertions, 14 deletions

diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 58a3c5c..434a6a4 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -59,25 +59,15 @@ enum eisa_device_ivars {
 /*
  * Simplified accessors for isa devices
  */
-#define EISA_ACCESSOR(A, B, T)						 \
-									 \
-static __inline T eisa_get_ ## A(device_t dev)				 \
-{									 \
-	uintptr_t v;							 \
-	BUS_READ_IVAR(device_get_parent(dev), dev, EISA_IVAR_ ## B, &v); \
-	return (T) v;							 \
-}									 \
-									 \
-static __inline void eisa_set_ ## A(device_t dev, T t)			 \
-{									 \
-	u_long v = (u_long) t;						 \
-	BUS_WRITE_IVAR(device_get_parent(dev), dev, EISA_IVAR_ ## B, v); \
-}
+#define EISA_ACCESSOR(var, ivar, type)					 \
+	__BUS_ACCESSOR(eisa, var, EISA, ivar, type)
 
 EISA_ACCESSOR(slot, SLOT, int)
 EISA_ACCESSOR(id, ID, eisa_id_t)
 EISA_ACCESSOR(irq, IRQ, eisa_id_t)
 
+#undef EISA_ACCESSOR
+
 int eisa_add_intr(device_t, int, int);
 
 #define		RESVADDR_NONE		0x00