Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci fix typos in log messages s/bus_dmamem_create/bu...



details:   https://anonhg.NetBSD.org/src/rev/9eeac6b3f19c
branches:  trunk
changeset: 371799:9eeac6b3f19c
user:      andvar <andvar%NetBSD.org@localhost>
date:      Tue Oct 11 22:03:37 2022 +0000

description:
fix typos in log messages s/bus_dmamem_create/bus_dmamap_create/ and
s/bus_dmamem_load/bus_dmamap_load/.
Inspired by recent similar fixes in OpenBSD.

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  6 +++---
 sys/arch/hppa/hppa/mainbus.c |  8 ++++----
 sys/arch/vax/vax/bus_dma.c   |  6 +++---
 sys/dev/pci/if_bge.c         |  8 ++++----
 sys/dev/pci/vioscsi.c        |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diffs (159 lines):

diff -r b491d879775c -r 9eeac6b3f19c sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Tue Oct 11 15:59:38 2022 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Tue Oct 11 22:03:37 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.137 2022/07/26 20:08:54 andvar Exp $     */
+/*     $NetBSD: bus_dma.c,v 1.138 2022/10/11 22:03:37 andvar Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.137 2022/07/26 20:08:54 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.138 2022/10/11 22:03:37 andvar Exp $");
 
 #include <sys/param.h>
 
@@ -1640,7 +1640,7 @@
        pmap_t pmap;
 
 #ifdef DEBUG_DMA
-       printf("_bus_dmamem_load_buffer(buf=%p, len=%#lx, flags=%#x)\n",
+       printf("_bus_dmamap_load_buffer(buf=%p, len=%#lx, flags=%#x)\n",
            buf, buflen, flags);
 #endif /* DEBUG_DMA */
 
diff -r b491d879775c -r 9eeac6b3f19c sys/arch/hppa/hppa/mainbus.c
--- a/sys/arch/hppa/hppa/mainbus.c      Tue Oct 11 15:59:38 2022 +0000
+++ b/sys/arch/hppa/hppa/mainbus.c      Tue Oct 11 22:03:37 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.10 2022/07/26 20:08:55 andvar Exp $      */
+/*     $NetBSD: mainbus.c,v 1.11 2022/10/11 22:03:37 andvar Exp $      */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2022/07/26 20:08:55 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2022/10/11 22:03:37 andvar Exp $");
 
 #include "locators.h"
 #include "power.h"
@@ -944,12 +944,12 @@
        for (m = TAILQ_FIRST(mlist); m != NULL; m = TAILQ_NEXT(m,pageq.queue)) {
 
                if (size == 0)
-                       panic("mbus_dmamem_load_raw: size botch");
+                       panic("mbus_dmamap_load_raw: size botch");
 
                pa = VM_PAGE_TO_PHYS(m);
                if (pa != pa_next) {
                        if (++seg >= map->_dm_segcnt)
-                               panic("mbus_dmamem_load_raw: nsegs botch");
+                               panic("mbus_dmamap_load_raw: nsegs botch");
                        map->dm_segs[seg].ds_addr = pa;
                        map->dm_segs[seg].ds_len = 0;
                }
diff -r b491d879775c -r 9eeac6b3f19c sys/arch/vax/vax/bus_dma.c
--- a/sys/arch/vax/vax/bus_dma.c        Tue Oct 11 15:59:38 2022 +0000
+++ b/sys/arch/vax/vax/bus_dma.c        Tue Oct 11 22:03:37 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.38 2022/07/26 20:08:56 andvar Exp $      */
+/*     $NetBSD: bus_dma.c,v 1.39 2022/10/11 22:03:37 andvar Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38 2022/07/26 20:08:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.39 2022/10/11 22:03:37 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -556,7 +556,7 @@
        pmap_t pmap;
 
 #ifdef DEBUG_DMA
-       printf("_bus_dmamem_load_buffer(buf=%p, len=%lx, flags=%d, 1st=%d)\n",
+       printf("_bus_dmamap_load_buffer(buf=%p, len=%lx, flags=%d, 1st=%d)\n",
            buf, buflen, flags, first);
 #endif /* DEBUG_DMA */
 
diff -r b491d879775c -r 9eeac6b3f19c sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Tue Oct 11 15:59:38 2022 +0000
+++ b/sys/dev/pci/if_bge.c      Tue Oct 11 22:03:37 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.387 2022/09/04 08:55:43 skrll Exp $       */
+/*     $NetBSD: if_bge.c,v 1.388 2022/10/11 22:03:37 andvar Exp $      */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.387 2022/09/04 08:55:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.388 2022/10/11 22:03:37 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -3814,7 +3814,7 @@
                    sc->bge_ring_rseg);
                return;
        }
-       DPRINTFN(5, ("bus_dmamem_create\n"));
+       DPRINTFN(5, ("bus_dmamap_create\n"));
        if (bus_dmamap_create(sc->bge_dmatag, sizeof(struct bge_ring_data), 1,
            sizeof(struct bge_ring_data), 0,
            BUS_DMA_WAITOK, &sc->bge_ring_map)) {
@@ -3825,7 +3825,7 @@
                    sc->bge_ring_rseg);
                return;
        }
-       DPRINTFN(5, ("bus_dmamem_load\n"));
+       DPRINTFN(5, ("bus_dmamap_load\n"));
        if (bus_dmamap_load(sc->bge_dmatag, sc->bge_ring_map, kva,
                            sizeof(struct bge_ring_data), NULL,
                            BUS_DMA_WAITOK)) {
diff -r b491d879775c -r 9eeac6b3f19c sys/dev/pci/vioscsi.c
--- a/sys/dev/pci/vioscsi.c     Tue Oct 11 15:59:38 2022 +0000
+++ b/sys/dev/pci/vioscsi.c     Tue Oct 11 22:03:37 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vioscsi.c,v 1.29 2022/01/27 18:38:07 jakllsch Exp $    */
+/*     $NetBSD: vioscsi.c,v 1.30 2022/10/11 22:03:37 andvar Exp $      */
 /*     $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.29 2022/01/27 18:38:07 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.30 2022/10/11 22:03:37 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -614,7 +614,7 @@
                    BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, &vr->vr_control);
                if (r != 0) {
                        aprint_error_dev(sc->sc_dev,
-                           "%s: bus_dmamem_create ctrl failed, error %d\n",
+                           "%s: bus_dmamap_create ctrl failed, error %d\n",
                            __func__, r);
                        goto cleanup;
                }
@@ -623,7 +623,7 @@
                    MAXPHYS, 0, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, &vr->vr_data);
                if (r != 0) {
                        aprint_error_dev(sc->sc_dev,
-                           "%s: bus_dmamem_create data failed, error %d\n",
+                           "%s: bus_dmamap_create data failed, error %d\n",
                            __func__, r);
                        goto cleanup;
                }



Home | Main Index | Thread Index | Old Index