CVS commit: src/sys/arch/arc/isa

[Christos Zoulas]

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 			/* 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 
 #include 
@@ -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;
 
 	/*

CVS commit: src/sys/arch/arc/isa

[David Young]

Module Name:src
Committed By:   dyoung
Date:   Wed Aug 19 15:16:10 UTC 2009

Modified Files:
src/sys/arch/arc/isa: isabus.c

Log Message:
Define, and hook into the isa_chipset_tag_t, isabr_detach_hook().


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arc/isa/isabus.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/isabus.c
diff -u src/sys/arch/arc/isa/isabus.c:1.44 src/sys/arch/arc/isa/isabus.c:1.45
--- src/sys/arch/arc/isa/isabus.c:1.44	Sat Jul  5 08:46:25 2008
+++ src/sys/arch/arc/isa/isabus.c	Wed Aug 19 15:16:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isabus.c,v 1.44 2008/07/05 08:46:25 tsutsui Exp $	*/
+/*	$NetBSD: isabus.c,v 1.45 2009/08/19 15:16:09 dyoung Exp $	*/
 /*	$OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $	*/
 /*	NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp 	*/
 
@@ -120,7 +120,7 @@
 */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isabus.c,v 1.44 2008/07/05 08:46:25 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: isabus.c,v 1.45 2009/08/19 15:16:09 dyoung Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -166,6 +166,7 @@
 
 static void isabr_attach_hook(device_t , device_t,
 struct isabus_attach_args *);
+static void isabr_detach_hook(isa_chipset_tag_t, device_t);
 static const struct evcnt *isabr_intr_evcnt(isa_chipset_tag_t, int);
 static void *isabr_intr_establish(isa_chipset_tag_t, int, int, int,
 int (*)(void *), void *);
@@ -193,6 +194,7 @@
 	isabr_initicu();
 
 	sc-arc_isa_cs.ic_attach_hook = isabr_attach_hook;
+	sc-arc_isa_cs.ic_detach_hook = isabr_detach_hook;
 	sc-arc_isa_cs.ic_intr_evcnt = isabr_intr_evcnt;
 	sc-arc_isa_cs.ic_intr_establish = isabr_intr_establish;
 	sc-arc_isa_cs.ic_intr_disestablish = isabr_intr_disestablish;
@@ -314,6 +316,13 @@
 	/* Nothing to do. */
 }
 
+static void
+isabr_detach_hook(isa_chipset_tag_t ic, device_t self)
+{
+
+	/* Nothing to do. */
+}
+
 static const struct evcnt *
 isabr_intr_evcnt(isa_chipset_tag_t ic, int irq)
 {