Module Name: src
Committed By: dyoung
Date: Mon Jul 25 20:33:20 UTC 2011
Modified Files:
src/sys/arch/x86/x86: bus_dma.c
Log Message:
In _bus_dmamap_load_busaddr(), just return 0 instead of assigning an
intermediate variable (int error = 0;) and returning that (return
error;).
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/x86/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.57 src/sys/arch/x86/x86/bus_dma.c:1.58
--- src/sys/arch/x86/x86/bus_dma.c:1.57 Fri Jul 1 18:21:31 2011
+++ src/sys/arch/x86/x86/bus_dma.c Mon Jul 25 20:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $ */
+/* $NetBSD: bus_dma.c,v 1.58 2011/07/25 20:33:20 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.58 2011/07/25 20:33:20 dyoung Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -407,7 +407,6 @@
bus_addr_t bmask = ~(map->_dm_boundary - 1);
bus_addr_t lastaddr = 0xdead; /* XXX gcc */
int sgsize;
- int error = 0;
if (nseg > 0)
lastaddr = segs[nseg-1].ds_addr + segs[nseg-1].ds_len;
@@ -453,7 +452,7 @@
goto again;
map->dm_nsegs = nseg;
- return error;
+ return 0;
}
/*
