Author: jhb
Date: Wed Jun 11 17:03:14 2014
New Revision: 267365
URL: http://svnweb.freebsd.org/changeset/base/267365
Log:
Fix a few more drivers that were explicitly destroying the bus_dma
map created by bus_dmamem_alloc().
Modified:
head/sys/dev/aha/aha.c
head/sys/dev/ahb/ahb.c
head/sys/dev/aic7xxx/aic79xx.c
head/sys/dev/aic7xxx/aic7xxx.c
head/sys/dev/de/if_de.c
Modified: head/sys/dev/aha/aha.c
==============================================================================
--- head/sys/dev/aha/aha.c Wed Jun 11 16:11:12 2014 (r267364)
+++ head/sys/dev/aha/aha.c Wed Jun 11 17:03:14 2014 (r267365)
@@ -209,7 +209,6 @@ aha_free(struct aha_softc *aha)
case 6:
bus_dmamem_free(aha->ccb_dmat, aha->aha_ccb_array,
aha->ccb_dmamap);
- bus_dmamap_destroy(aha->ccb_dmat, aha->ccb_dmamap);
case 5:
bus_dma_tag_destroy(aha->ccb_dmat);
case 4:
@@ -217,7 +216,6 @@ aha_free(struct aha_softc *aha)
case 3:
bus_dmamem_free(aha->mailbox_dmat, aha->in_boxes,
aha->mailbox_dmamap);
- bus_dmamap_destroy(aha->mailbox_dmat, aha->mailbox_dmamap);
case 2:
bus_dma_tag_destroy(aha->buffer_dmat);
case 1:
Modified: head/sys/dev/ahb/ahb.c
==============================================================================
--- head/sys/dev/ahb/ahb.c Wed Jun 11 16:11:12 2014 (r267364)
+++ head/sys/dev/ahb/ahb.c Wed Jun 11 17:03:14 2014 (r267365)
@@ -421,7 +421,6 @@ ahbfree(struct ahb_softc *ahb)
case 3:
bus_dmamem_free(ahb->ecb_dmat, ahb->ecb_array,
ahb->ecb_dmamap);
- bus_dmamap_destroy(ahb->ecb_dmat, ahb->ecb_dmamap);
case 2:
bus_dma_tag_destroy(ahb->ecb_dmat);
case 1:
Modified: head/sys/dev/aic7xxx/aic79xx.c
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx.c Wed Jun 11 16:11:12 2014
(r267364)
+++ head/sys/dev/aic7xxx/aic79xx.c Wed Jun 11 17:03:14 2014
(r267365)
@@ -5413,8 +5413,6 @@ ahd_free(struct ahd_softc *ahd)
case 3:
aic_dmamem_free(ahd, ahd->shared_data_dmat, ahd->qoutfifo,
ahd->shared_data_map.dmamap);
- aic_dmamap_destroy(ahd, ahd->shared_data_dmat,
- ahd->shared_data_map.dmamap);
/* FALLTHROUGH */
case 2:
aic_dma_tag_destroy(ahd, ahd->shared_data_dmat);
Modified: head/sys/dev/aic7xxx/aic7xxx.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx.c Wed Jun 11 16:11:12 2014
(r267364)
+++ head/sys/dev/aic7xxx/aic7xxx.c Wed Jun 11 17:03:14 2014
(r267365)
@@ -4061,8 +4061,6 @@ ahc_free(struct ahc_softc *ahc)
case 3:
aic_dmamem_free(ahc, ahc->shared_data_dmat, ahc->qoutfifo,
ahc->shared_data_dmamap);
- aic_dmamap_destroy(ahc, ahc->shared_data_dmat,
- ahc->shared_data_dmamap);
/* FALLTHROUGH */
case 2:
aic_dma_tag_destroy(ahc, ahc->shared_data_dmat);
@@ -4501,8 +4499,6 @@ ahc_fini_scbdata(struct ahc_softc *ahc)
case 5:
aic_dmamem_free(ahc, scb_data->sense_dmat, scb_data->sense,
scb_data->sense_dmamap);
- aic_dmamap_destroy(ahc, scb_data->sense_dmat,
- scb_data->sense_dmamap);
case 4:
aic_dma_tag_destroy(ahc, scb_data->sense_dmat);
case 3:
@@ -4511,8 +4507,6 @@ ahc_fini_scbdata(struct ahc_softc *ahc)
case 2:
aic_dmamem_free(ahc, scb_data->hscb_dmat, scb_data->hscbs,
scb_data->hscb_dmamap);
- aic_dmamap_destroy(ahc, scb_data->hscb_dmat,
- scb_data->hscb_dmamap);
case 1:
aic_dma_tag_destroy(ahc, scb_data->hscb_dmat);
break;
Modified: head/sys/dev/de/if_de.c
==============================================================================
--- head/sys/dev/de/if_de.c Wed Jun 11 16:11:12 2014 (r267364)
+++ head/sys/dev/de/if_de.c Wed Jun 11 17:03:14 2014 (r267365)
@@ -4558,7 +4558,6 @@ tulip_busdma_cleanup(tulip_softc_t * con
if (sc->tulip_setupbuf != NULL) {
bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupbuf,
sc->tulip_setup_map);
- bus_dmamap_destroy(sc->tulip_setup_tag, sc->tulip_setup_map);
sc->tulip_setup_map = NULL;
sc->tulip_setupbuf = NULL;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
