Module Name: src
Committed By: christos
Date: Mon Feb 29 15:28:35 UTC 2016
Modified Files:
src/sys/arch/alpha/isa: isadma_bounce.c
Log Message:
PR/50854: David Binderman: Remove redundant code.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/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/alpha/isa/isadma_bounce.c
diff -u src/sys/arch/alpha/isa/isadma_bounce.c:1.12 src/sys/arch/alpha/isa/isadma_bounce.c:1.13
--- src/sys/arch/alpha/isa/isadma_bounce.c:1.12 Sun Feb 5 21:14:13 2012
+++ src/sys/arch/alpha/isa/isadma_bounce.c Mon Feb 29 10:28:35 2016
@@ -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 @@ isadma_bounce_dmamap_load(bus_dma_tag_t
* 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 @@ isadma_bounce_dmamap_load_mbuf(bus_dma_t
* 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);
/*
