[src/trunk]: src/sys/arch/x68k/dev PR/50859: David Binderman: Remove redundan...

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

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

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

diffstat:

 sys/arch/x68k/dev/intio.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 45c733adf851 -r cc0d7c29a4a9 sys/arch/x68k/dev/intio.c
--- a/sys/arch/x68k/dev/intio.c Fri Feb 26 18:17:39 2016 +0000
+++ b/sys/arch/x68k/dev/intio.c Fri Feb 26 18:19:16 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intio.c,v 1.43 2012/01/27 18:53:06 para Exp $  */
+/*     $NetBSD: intio.c,v 1.44 2016/02/26 18:19:16 christos Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.43 2012/01/27 18:53:06 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.44 2016/02/26 18:19:16 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -514,8 +514,7 @@
         * and we can bounce, we will.
         */
        error = x68k_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);
 
        /*
@@ -580,8 +579,7 @@
         * and we can bounce, we will.
         */
        error = x68k_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);
 
        /*