Module Name: src
Committed By: christos
Date: Fri Feb 26 18:19:16 UTC 2016
Modified Files:
src/sys/arch/x68k/dev: intio.c
Log Message:
PR/50859: David Binderman: Remove redundant code.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x68k/dev/intio.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/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.43 src/sys/arch/x68k/dev/intio.c:1.44
--- src/sys/arch/x68k/dev/intio.c:1.43 Fri Jan 27 13:53:06 2012
+++ src/sys/arch/x68k/dev/intio.c Fri Feb 26 13:19:16 2016
@@ -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 @@ _intio_bus_dmamap_load(bus_dma_tag_t t,
* 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 @@ _intio_bus_dmamap_load_mbuf(bus_dma_tag_
* 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);
/*
