[src/trunk]: src/sys/dev/ic Use bus_dmamap_load instead of bus_dmamap_load_raw

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a87da7668e07
branches:  trunk
changeset: 338435:a87da7668e07
user:      matt <matt%NetBSD.org@localhost>
date:      Sun May 24 17:08:50 2015 +0000

description:
Use bus_dmamap_load instead of bus_dmamap_load_raw

diffstat:

 sys/dev/ic/arn5008.c |  12 ++++++------
 sys/dev/ic/arn9003.c |  12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (80 lines):

diff -r 26ba0229c24d -r a87da7668e07 sys/dev/ic/arn5008.c
--- a/sys/dev/ic/arn5008.c      Sun May 24 17:08:21 2015 +0000
+++ b/sys/dev/ic/arn5008.c      Sun May 24 17:08:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $     */
+/*     $NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $ */
 /*     $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $    */
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -518,8 +518,8 @@
        if (error != 0)
                goto fail;
 
-       error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size,
-           BUS_DMA_NOWAIT);
+       error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs,
+           size, NULL, BUS_DMA_NOWAIT);
        if (error != 0)
                goto fail;
 
@@ -606,8 +606,8 @@
        if (error != 0)
                goto fail;
 
-       error = bus_dmamap_load_raw(sc->sc_dmat, rxq->map, &rxq->seg, 1,
-           size, BUS_DMA_NOWAIT);
+       error = bus_dmamap_load(sc->sc_dmat, rxq->map, &rxq->descs,
+           size, NULL, BUS_DMA_NOWAIT);
        if (error != 0)
                goto fail;
 
diff -r 26ba0229c24d -r a87da7668e07 sys/dev/ic/arn9003.c
--- a/sys/dev/ic/arn9003.c      Sun May 24 17:08:21 2015 +0000
+++ b/sys/dev/ic/arn9003.c      Sun May 24 17:08:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $     */
+/*     $NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $ */
 /*     $OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $        */
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -655,8 +655,8 @@
        if (error != 0)
                goto fail;
 
-       error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_txsmap, &sc->sc_txsseg,
-           1, size, BUS_DMA_NOWAIT | BUS_DMA_READ);
+       error = bus_dmamap_load(sc->sc_dmat, sc->sc_txsmap, sc->sc_txsring,
+            size, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
        if (error != 0)
                goto fail;
 
@@ -681,8 +681,8 @@
        if (error != 0)
                goto fail;
 
-       error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size,
-           BUS_DMA_NOWAIT | BUS_DMA_WRITE);
+       error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs, size,
+           NULL, BUS_DMA_NOWAIT | BUS_DMA_WRITE);
        if (error != 0)
                goto fail;