Module Name: src
Committed By: christos
Date: Fri Feb 26 18:16:51 UTC 2016
Modified Files:
src/sys/arch/atari/isa: isa_dma.c
Log Message:
PR/50857: David Binderman: Remove redundant code.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/atari/isa/isa_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/atari/isa/isa_dma.c
diff -u src/sys/arch/atari/isa/isa_dma.c:1.11 src/sys/arch/atari/isa/isa_dma.c:1.12
--- src/sys/arch/atari/isa/isa_dma.c:1.11 Mon Feb 13 14:59:59 2012
+++ src/sys/arch/atari/isa/isa_dma.c Fri Feb 26 13:16:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_dma.c,v 1.11 2012/02/13 19:59:59 jdc Exp $ */
+/* $NetBSD: isa_dma.c,v 1.12 2016/02/26 18:16:51 christos Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.11 2012/02/13 19:59:59 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.12 2016/02/26 18:16:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -281,8 +281,7 @@ _isa_bus_dmamap_load(bus_dma_tag_t t, bu
* and we can bounce, we will.
*/
error = _bus_dmamap_load(t, map, buf, buflen, p, flags);
- if (error == 0 ||
- (error != 0 && (cookie->id_flags & ID_MIGHT_NEED_BOUNCE) == 0))
+ if (error == 0 || (cookie->id_flags & ID_MIGHT_NEED_BOUNCE) == 0)
return (error);
/*
@@ -353,8 +352,7 @@ _isa_bus_dmamap_load_mbuf(bus_dma_tag_t
* and we can bounce, we will.
*/
error = _bus_dmamap_load_mbuf(t, map, m0, flags);
- if (error == 0 ||
- (error != 0 && (cookie->id_flags & ID_MIGHT_NEED_BOUNCE) == 0))
+ if (error == 0 || (cookie->id_flags & ID_MIGHT_NEED_BOUNCE) == 0)
return (error);
/*
