diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 75234d6cbaf5..cb3e060d6d8e 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -1129,7 +1129,7 @@ digiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 			return (error);
 
 		case DIGIIO_MODEL:
-			*(digiModel_t *)data = sc->model;
+			*(enum digi_model *)data = sc->model;
 			return (0);
 
 		case DIGIIO_IDENT:
diff --git a/sys/dev/digi/digi.h b/sys/dev/digi/digi.h
index b4ed14fd7cc3..bee32f77d75b 100644
--- a/sys/dev/digi/digi.h
+++ b/sys/dev/digi/digi.h
@@ -180,7 +180,7 @@ struct digi_softc {
 	int win_bits;
 	int mem_size;
 	int mem_seg;
-	digiModel_t model;
+	enum digi_model model;
 	const struct digi_control_signals *csigs;
 	int opencnt;
 	unsigned pcibus : 1;		/* On a PCI bus ? */
diff --git a/sys/dev/digi/digiio.h b/sys/dev/digi/digiio.h
index e3dfba6099a1..6719b1897f81 100644
--- a/sys/dev/digi/digiio.h
+++ b/sys/dev/digi/digiio.h
@@ -26,15 +26,10 @@
  * $FreeBSD$
  */
 
-typedef struct {
-	int32_t size;
-	const u_int8_t *data;
-} digiDescriptor_t;
-
 /*
  * A very small subset of cards.
  */
-typedef enum {
+enum digi_model {
 	PCXE,
 	PCXEVE,
 	PCXI,
@@ -42,7 +37,7 @@ typedef enum {
 	PCCX,
 	PCIEPCX,
 	PCIXR
-} digiModel_t;
+};
 
 enum {
 	DIGIDB_INIT = (1<<0),
@@ -62,5 +57,5 @@ enum {
 #define	DIGIIO_REINIT	_IO('e', 'A')
 #define	DIGIIO_DEBUG	_IOW('e', 'B', int)
 #define	DIGIIO_RING	_IO('e', 'C')
-#define	DIGIIO_MODEL	_IOR('e', 'D', digiModel_t)
+#define	DIGIIO_MODEL	_IOR('e', 'D', enum digi_model)
 #define	DIGIIO_IDENT	_IOW('e', 'E', char *)
diff --git a/sys/sys/digiio.h b/sys/sys/digiio.h
index e3dfba6099a1..6719b1897f81 100644
--- a/sys/sys/digiio.h
+++ b/sys/sys/digiio.h
@@ -26,15 +26,10 @@
  * $FreeBSD$
  */
 
-typedef struct {
-	int32_t size;
-	const u_int8_t *data;
-} digiDescriptor_t;
-
 /*
  * A very small subset of cards.
  */
-typedef enum {
+enum digi_model {
 	PCXE,
 	PCXEVE,
 	PCXI,
@@ -42,7 +37,7 @@ typedef enum {
 	PCCX,
 	PCIEPCX,
 	PCIXR
-} digiModel_t;
+};
 
 enum {
 	DIGIDB_INIT = (1<<0),
@@ -62,5 +57,5 @@ enum {
 #define	DIGIIO_REINIT	_IO('e', 'A')
 #define	DIGIIO_DEBUG	_IOW('e', 'B', int)
 #define	DIGIIO_RING	_IO('e', 'C')
-#define	DIGIIO_MODEL	_IOR('e', 'D', digiModel_t)
+#define	DIGIIO_MODEL	_IOR('e', 'D', enum digi_model)
 #define	DIGIIO_IDENT	_IOW('e', 'E', char *)