Fix some more missing dt_ prefixes for dma tag fields.

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index 2a90c01..de15af0 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -1093,9 +1093,9 @@ sparc64_dmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f,
 {
 	bus_dma_tag_t lt;
 
-	for (lt = pt; lt->dmamem_alloc == NULL; lt = lt->parent)
+	for (lt = pt; lt->dt_dmamem_alloc == NULL; lt = lt->dt_parent)
 		;
-	return ((*lt->dmamem_alloc_size)(lt, dt, v, f, m, s));
+	return ((*lt->dt_dmamem_alloc_size)(lt, dt, v, f, m, s));
 }
 #define	bus_dmamem_alloc_size(t, v, f, m, s)				\
 	sparc64_dmamem_alloc_size((t), (t), (v), (f), (m), (s))
@@ -1119,9 +1119,9 @@ sparc64_dmamem_free_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void *v,
 {
 	bus_dma_tag_t lt;
 
-	for (lt = pt; lt->dmamem_free == NULL; lt = lt->parent)
+	for (lt = pt; lt->dt_dmamem_free == NULL; lt = lt->dt_parent)
 		;
-	(*lt->dmamem_free_size)(lt, dt, v, m, s);
+	(*lt->dt_dmamem_free_size)(lt, dt, v, m, s);
 }
 #define	bus_dmamem_free_size(t, v, m, s)				\
 	sparc64_dmamem_free_size((t), (t), (v), (m), (s))
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 418b81c..6413fd3 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -1325,7 +1325,7 @@ psycho_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 {
 	struct psycho_softc *sc;
 
-	sc = (struct psycho_softc *)pdmat->cookie;
+	sc = (struct psycho_softc *)pdmat->dt_cookie;
 	return (iommu_dvmamem_alloc_size(pdmat, ddmat, sc->sc_is, vaddr, flags,
 	    mapp, size));
 }
@@ -1347,7 +1347,7 @@ psycho_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
 {
 	struct psycho_softc *sc;
 
-	sc = (struct psycho_softc *)pdmat->cookie;
+	sc = (struct psycho_softc *)pdmat->dt_cookie;
 	iommu_dvmamem_free_size(pdmat, ddmat, sc->sc_is, vaddr, map, size);
 }
 
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 2689090..9df93a7 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -997,7 +997,7 @@ static int
 sbus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
     int flags, bus_dmamap_t *mapp, bus_size_t size)
 {
-	struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie;
+	struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
 
 	return (iommu_dvmamem_alloc_size(pdmat, ddmat, &sc->sc_is, vaddr, flags,
 		    mapp, size));
@@ -1017,7 +1017,7 @@ static void
 sbus_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
     bus_dmamap_t map, bus_size_t size)
 {
-	struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie;
+	struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
 
 	iommu_dvmamem_free_size(pdmat, ddmat, &sc->sc_is, vaddr, map, size);
 }
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 375f894..6332ca9 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -674,7 +674,7 @@ iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
 {
 	int error;
 
-	if (size > dt->maxsize)
+	if (size > dt->dt_maxsize)
 		return (ENOMEM);
 
 	/*
@@ -703,7 +703,7 @@ iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
     void **vaddr, int flags, bus_dmamap_t *mapp)
 {
 	return (iommu_dvmamem_alloc_size(pt, dt, is, vaddr, flags, mapp,
-	    dt->maxsize));
+	    dt->dt_maxsize));
 }
 
 void
@@ -720,7 +720,7 @@ void
 iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
     void *vaddr, bus_dmamap_t map)
 {
-	iommu_dvmamem_free_size(pt, dt, is, vaddr, map, dt->maxsize);
+	iommu_dvmamem_free_size(pt, dt, is, vaddr, map, dt->dt_maxsize);
 }
 
 int