Module Name: src Committed By: christos Date: Fri Feb 26 18:14:38 UTC 2016
Modified Files: src/sys/arch/arc/isa: isadma_bounce.c Log Message: PR/50855: David Binderman: Remove redundant code. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/isa/isadma_bounce.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/arc/isa/isadma_bounce.c diff -u src/sys/arch/arc/isa/isadma_bounce.c:1.14 src/sys/arch/arc/isa/isadma_bounce.c:1.15 --- src/sys/arch/arc/isa/isadma_bounce.c:1.14 Thu Jun 11 04:22:08 2015 +++ src/sys/arch/arc/isa/isadma_bounce.c Fri Feb 26 13:14:38 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: isadma_bounce.c,v 1.14 2015/06/11 08:22:08 matt Exp $ */ +/* $NetBSD: isadma_bounce.c,v 1.15 2016/02/26 18:14:38 christos Exp $ */ /* NetBSD: isadma_bounce.c,v 1.2 2000/06/01 05:49:36 thorpej Exp */ /*- @@ -33,7 +33,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.14 2015/06/11 08:22:08 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.15 2016/02/26 18:14:38 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -251,8 +251,7 @@ isadma_bounce_dmamap_load(bus_dma_tag_t * 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; /* @@ -321,8 +320,7 @@ isadma_bounce_dmamap_load_mbuf(bus_dma_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; /*