[src/trunk]: src/sys/dev/pci Back out previous mistake.

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

details:   https://anonhg.NetBSD.org/src/rev/3bb055b22075
branches:  trunk
changeset: 329840:3bb055b22075
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jun 11 17:01:31 2014 +0000

description:
Back out previous mistake.

If you mixed `cvs diff' and `cvs commit' in your shell history,
remember to hit C-p the right number of times before RET.  Oops.

diffstat:

 sys/dev/pci/agp_i810.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r b0182b51ed77 -r 3bb055b22075 sys/dev/pci/agp_i810.c
--- a/sys/dev/pci/agp_i810.c    Wed Jun 11 17:01:04 2014 +0000
+++ b/sys/dev/pci/agp_i810.c    Wed Jun 11 17:01:31 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 riastradh Exp $  */
+/*     $NetBSD: agp_i810.c,v 1.92 2014/06/11 17:01:31 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.92 2014/06/11 17:01:31 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1242,7 +1242,7 @@
 
        switch (mem->am_type) {
        case AGP_I810_MEMTYPE_MAIN:
-               error = agp_generic_bind_memory(sc, mem, offset);
+               error = agp_i810_bind_memory_main(sc, mem, offset);
                break;
        case AGP_I810_MEMTYPE_DCACHE:
                error = agp_i810_bind_memory_dcache(sc, mem, offset);
@@ -1261,7 +1261,7 @@
        return 0;
 }
 
-static int __unused
+static int
 agp_i810_bind_memory_main(struct agp_softc *sc, struct agp_memory *mem,
     off_t offset)
 {
@@ -1294,7 +1294,7 @@
        segs = malloc(nseg_alloc * sizeof(*segs), M_AGP, M_WAITOK);
 
        /* Allocate DMA-safe physical segments.  */
-       error = bus_dmamem_alloc(sc->as_dmat, mem->am_size, AGP_PAGE_SIZE,
+       error = bus_dmamem_alloc(sc->as_dmat, mem->am_size, PAGE_SIZE,
            0, segs, nseg_alloc, &nseg, BUS_DMA_WAITOK);
        if (error)
                goto fail1;
@@ -1414,7 +1414,7 @@
        case AGP_I810_MEMTYPE_MAIN:
        case AGP_I810_MEMTYPE_HWCURSOR:
                for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
-                       (void)agp_i810_unbind_page(sc, mem->am_offset + i);
+                       agp_i810_unbind_page(sc, mem->am_offset + i);
                break;
        case AGP_I810_MEMTYPE_DCACHE:
                KASSERT(isc->chiptype == CHIP_I810);