[src/trunk]: src/sys/arch/evbmips/isa PR/50856: David Binderman: Remove redun...

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

details:   https://anonhg.NetBSD.org/src/rev/70711023d3f9
branches:  trunk
changeset: 343781:70711023d3f9
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 26 18:15:59 2016 +0000

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

diffstat:

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

diffs (38 lines):

diff -r daf0ff5b3410 -r 70711023d3f9 sys/arch/evbmips/isa/isadma_bounce.c
--- a/sys/arch/evbmips/isa/isadma_bounce.c      Fri Feb 26 18:14:38 2016 +0000
+++ b/sys/arch/evbmips/isa/isadma_bounce.c      Fri Feb 26 18:15:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $  */
+/*     $NetBSD: isadma_bounce.c,v 1.12 2016/02/26 18:15:59 christos Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.12 2016/02/26 18:15:59 christos Exp $");
 
 #define _MIPS_BUS_DMA_PRIVATE
 
@@ -178,8 +178,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 & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0))
+       if (error == 0 || (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0)
                return (error);
 
        /*
@@ -248,8 +247,7 @@
         * and we can bounce, we will.
         */
        error = _bus_dmamap_load_mbuf(t, map, m0, flags);
-       if (error == 0 ||
-           (error != 0 && (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0))
+       if (error == 0 || (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0)
                return (error);
 
        /*