From owner-p4-projects@FreeBSD.ORG  Mon Mar 23 06:52:54 2015
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id A55F0D78; Mon, 23 Mar 2015 06:52:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 65A82D76
 for <perforce@freebsd.org>; Mon, 23 Mar 2015 06:52:54 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 50D5981F
 for <perforce@freebsd.org>; Mon, 23 Mar 2015 06:52:54 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id t2N6qsgD060983
 for <perforce@freebsd.org>; Mon, 23 Mar 2015 06:52:54 GMT
 (envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id t2N6qscu060980
 for perforce@freebsd.org; Mon, 23 Mar 2015 06:52:54 GMT
 (envelope-from jmg@freebsd.org)
Date: Mon, 23 Mar 2015 06:52:54 GMT
Message-Id: <201503230652.t2N6qscu060980@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Subject: PERFORCE change 1207530 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 23 Mar 2015 06:52:54 -0000

http://p4web.freebsd.org/@@1207530?ac=10

Change 1207530 by jmg@jmg_pciehp on 2015/03/23 06:51:53

	simplify how resume is handled, ones we resume, NULL out, and
	then resume the rest.. this keeps the list of important ones in
	a single place...
	
	Sponsored by:	FreeBSD Foundation

Affected files ...

.. //depot/projects/pciehotplug/sys/dev/pci/pci.c#8 edit

Differences ...

==== //depot/projects/pciehotplug/sys/dev/pci/pci.c#8 (text+ko) ====

@@ -3829,20 +3829,14 @@
 		case PCIC_BRIDGE:
 		case PCIC_BASEPERIPH:
 			BUS_RESUME_CHILD(dev, child);
+			devlist[i] = NULL;
 			break;
 		}
 	}
 	for (i = 0; i < numdevs; i++) {
 		child = devlist[i];
-		switch (pci_get_class(child)) {
-		case PCIC_DISPLAY:
-		case PCIC_MEMORY:
-		case PCIC_BRIDGE:
-		case PCIC_BASEPERIPH:
-			break;
-		default:
+		if (child != NULL)
 			BUS_RESUME_CHILD(dev, child);
-		}
 	}
 	free(devlist, M_TEMP);
 	return (0);