Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Add missing bus_dmamap_destroy.
details: https://anonhg.NetBSD.org/src/rev/56ff47aee12a
branches: trunk
changeset: 329838:56ff47aee12a
user: riastradh <riastradh%NetBSD.org@localhost>
date: Wed Jun 11 16:58:29 2014 +0000
description:
Add missing bus_dmamap_destroy.
diffstat:
sys/dev/pci/agp_i810.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r f0e4c7afe490 -r 56ff47aee12a sys/dev/pci/agp_i810.c
--- a/sys/dev/pci/agp_i810.c Wed Jun 11 16:48:15 2014 +0000
+++ b/sys/dev/pci/agp_i810.c Wed Jun 11 16:58:29 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.90 2014/06/11 16:48:15 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.90 2014/06/11 16:48:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.91 2014/06/11 16:58:29 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_i810_bind_memory_main(sc, mem, offset);
+ error = agp_generic_bind_memory(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
+static int __unused
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, PAGE_SIZE,
+ error = bus_dmamem_alloc(sc->as_dmat, mem->am_size, AGP_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)
- agp_i810_unbind_page(sc, mem->am_offset + i);
+ (void)agp_i810_unbind_page(sc, mem->am_offset + i);
break;
case AGP_I810_MEMTYPE_DCACHE:
KASSERT(isc->chiptype == CHIP_I810);
Home |
Main Index |
Thread Index |
Old Index