From owner-p4-projects@FreeBSD.ORG  Mon Mar  5 22:31:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2D9416A405; Mon,  5 Mar 2007 22:31:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7E3B716A402
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 22:31:23 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E42E13C441
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 22:31:23 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l25MVNvl065806
	for <perforce@freebsd.org>; Mon, 5 Mar 2007 22:31:23 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l25MVN2x065803
	for perforce@freebsd.org; Mon, 5 Mar 2007 22:31:23 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 5 Mar 2007 22:31:23 GMT
Message-Id: <200703052231.l25MVN2x065803@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115376 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Mar 2007 22:31:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=115376

Change 115376 by piso@piso_newluxor on 2007/03/05 22:30:51

	o Axe a bogus and redundant check.
	o Add a proper check for filter only handlers.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#12 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#12 (text+ko) ====

@@ -605,8 +605,11 @@
 	port = device_get_ivars(child);
 	KASSERT(port != NULL, ("%s %d", __func__, __LINE__));
 
-	if (filt == NULL || cookiep == NULL || res != port->p_ires)
+	if (cookiep == NULL || res != port->p_ires)
 		return (EINVAL);
+	/* We demand that serdev devices use filter_only interrupts. */
+	if (ihand != NULL)
+		return (ENXIO);
 	if (rman_get_device(port->p_ires) != originator)
 		return (ENXIO);
 
@@ -629,10 +632,6 @@
 		return (BUS_SETUP_INTR(device_get_parent(dev), originator,
 		    sc->sc_ires, flags, filt, ihand, arg, cookiep));
 
-	/* We demand that serdev devices use filter_only interrupts. */
-	if (filt != NULL)
-		return (ENXIO);
-
 	sc->sc_serdevs |= 1UL << (port->p_nr - 1);
 
 	port->p_hasintr = 1;