Module Name: src
Committed By: christos
Date: Fri Feb 26 18:15:59 UTC 2016
Modified Files:
src/sys/arch/evbmips/isa: isadma_bounce.c
Log Message:
PR/50856: David Binderman: Remove redundant code.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/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/evbmips/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.11 src/sys/arch/evbmips/isa/isadma_bounce.c:1.12
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.11 Sat Jul 9 20:03:53 2011
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Fri Feb 26 13:15:59 2016
@@ -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 @@ 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 & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0))
+ if (error == 0 || (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0)
return (error);
/*
@@ -248,8 +247,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 & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0))
+ if (error == 0 || (cookie->id_flags & _BUS_DMA_MIGHT_NEED_BOUNCE) == 0)
return (error);
/*
