[src/trunk]: src/sys/arch/atari/isa PR/50857: David Binderman: Remove redunda...

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

details:   https://anonhg.NetBSD.org/src/rev/e3549384e922
branches:  trunk
changeset: 343782:e3549384e922
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 26 18:16:51 2016 +0000

description:
PR/50857: David Binderman: Remove redundant code.

diffstat:

 sys/arch/atari/isa/isa_dma.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 70711023d3f9 -r e3549384e922 sys/arch/atari/isa/isa_dma.c
--- a/sys/arch/atari/isa/isa_dma.c      Fri Feb 26 18:15:59 2016 +0000
+++ b/sys/arch/atari/isa/isa_dma.c      Fri Feb 26 18:16:51 2016 +0000
@@ -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 @@
         * 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 @@
         * 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);
 
        /*