[src/trunk]: src/sys/arch/alpha/isa PR/50854: David Binderman: Remove redunda...

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

details:   https://anonhg.NetBSD.org/src/rev/f282d68d8ae0
branches:  trunk
changeset: 814011:f282d68d8ae0
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 29 15:28:35 2016 +0000

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

diffstat:

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

diffs (38 lines):

diff -r e56c9a65b40d -r f282d68d8ae0 sys/arch/alpha/isa/isadma_bounce.c
--- a/sys/arch/alpha/isa/isadma_bounce.c        Mon Feb 29 14:57:07 2016 +0000
+++ b/sys/arch/alpha/isa/isadma_bounce.c        Mon Feb 29 15:28:35 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.12 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.13 2016/02/29 15:28:35 christos Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.12 2012/02/06 02:14:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.13 2016/02/29 15:28:35 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -213,8 +213,7 @@
         * and we can bounce, we will.
         */
        error = _bus_dmamap_load_direct(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);
 
        /*
@@ -284,8 +283,7 @@
         * and we can bounce, we will.
         */
        error = _bus_dmamap_load_mbuf_direct(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);
 
        /*