Author: kevlo
Date: Wed Oct 21 06:23:57 2015
New Revision: 289679
URL: https://svnweb.freebsd.org/changeset/base/289679
Log:
Remove BUS_DMA_NOWAIT from bus_dma_tag_create() invocations as it's
no valid flag there.
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/iwn/if_iwn.c
head/sys/dev/wpi/if_wpi.c
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Wed Oct 21 05:52:04 2015 (r289678)
+++ head/sys/dev/iwm/if_iwm.c Wed Oct 21 06:23:57 2015 (r289679)
@@ -717,7 +717,7 @@ iwm_dma_contig_alloc(bus_dma_tag_t tag,
error = bus_dma_tag_create(tag, alignment,
0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size,
- 1, size, BUS_DMA_NOWAIT, NULL, NULL, &dma->tag);
+ 1, size, 0, NULL, NULL, &dma->tag);
if (error != 0)
goto fail;
@@ -851,8 +851,7 @@ iwm_alloc_rx_ring(struct iwm_softc *sc,
/* Create RX buffer DMA tag. */
error = bus_dma_tag_create(sc->sc_dmat, 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
- IWM_RBUF_SIZE, 1, IWM_RBUF_SIZE, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ IWM_RBUF_SIZE, 1, IWM_RBUF_SIZE, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not create RX buf DMA tag, error %d\n",
@@ -957,8 +956,7 @@ iwm_alloc_tx_ring(struct iwm_softc *sc,
error = bus_dma_tag_create(sc->sc_dmat, 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES,
- IWM_MAX_SCATTER - 1, MCLBYTES, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ IWM_MAX_SCATTER - 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev, "could not create TX buf DMA tag\n");
goto fail;
Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c Wed Oct 21 05:52:04 2015 (r289678)
+++ head/sys/dev/iwn/if_iwn.c Wed Oct 21 06:23:57 2015 (r289679)
@@ -1732,7 +1732,7 @@ iwn_dma_contig_alloc(struct iwn_softc *s
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), alignment,
0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size,
- 1, size, BUS_DMA_NOWAIT, NULL, NULL, &dma->tag);
+ 1, size, 0, NULL, NULL, &dma->tag);
if (error != 0)
goto fail;
@@ -1861,8 +1861,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc,
/* Create RX buffer DMA tag. */
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
- IWN_RBUF_SIZE, 1, IWN_RBUF_SIZE, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ IWN_RBUF_SIZE, 1, IWN_RBUF_SIZE, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not create RX buf DMA tag, error %d\n",
@@ -2008,8 +2007,7 @@ iwn_alloc_tx_ring(struct iwn_softc *sc,
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES,
- IWN_MAX_SCATTER - 1, MCLBYTES, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ IWN_MAX_SCATTER - 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not create TX buf DMA tag, error %d\n",
Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c Wed Oct 21 05:52:04 2015 (r289678)
+++ head/sys/dev/wpi/if_wpi.c Wed Oct 21 06:23:57 2015 (r289679)
@@ -918,7 +918,7 @@ wpi_dma_contig_alloc(struct wpi_softc *s
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), alignment,
0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size,
- 1, size, BUS_DMA_NOWAIT, NULL, NULL, &dma->tag);
+ 1, size, 0, NULL, NULL, &dma->tag);
if (error != 0)
goto fail;
@@ -1019,8 +1019,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc)
/* Create RX buffer DMA tag. */
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
- MJUMPAGESIZE, 1, MJUMPAGESIZE, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ MJUMPAGESIZE, 1, MJUMPAGESIZE, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not create RX buf DMA tag, error %d\n",
@@ -1203,8 +1202,7 @@ wpi_alloc_tx_ring(struct wpi_softc *sc,
error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES,
- WPI_MAX_SCATTER - 1, MCLBYTES, BUS_DMA_NOWAIT, NULL, NULL,
- &ring->data_dmat);
+ WPI_MAX_SCATTER - 1, MCLBYTES, 0, NULL, NULL, &ring->data_dmat);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not create TX buf DMA tag, error %d\n",
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
