From owner-p4-projects@FreeBSD.ORG  Fri Apr  1 16:33:06 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 52EF01065D97; Fri,  1 Apr 2011 16:33:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B01261065D40
	for <perforce@freebsd.org>; Fri,  1 Apr 2011 16:33:03 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 985EF8FC1A
	for <perforce@freebsd.org>; Fri,  1 Apr 2011 16:33:03 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p31GX3vs075765
	for <perforce@freebsd.org>; Fri, 1 Apr 2011 16:33:03 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p31GX3OS075762
	for perforce@freebsd.org; Fri, 1 Apr 2011 16:33:03 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 1 Apr 2011 16:33:03 GMT
Message-Id: <201104011633.p31GX3OS075762@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 190818 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 01 Apr 2011 16:33:06 -0000

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

Change 190818 by jhb@jhb_jhbbsd on 2011/03/31 11:59:05

	Cleanup.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#9 edit

Differences ...

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

@@ -4179,9 +4179,6 @@
 void
 pci_cfg_restore(device_t dev, struct pci_devinfo *dinfo)
 {
-#if 0
-	int i;
-#endif
 
 	/*
 	 * Only do header type 0 devices.  Type 1 devices are bridges,
@@ -4203,11 +4200,6 @@
 	 */
 	if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0)
 		pci_set_powerstate(dev, PCI_POWERSTATE_D0);
-#if 0
-	for (i = 0; i < dinfo->cfg.nummaps; i++)
-		pci_write_config(dev, PCIR_BAR(i), dinfo->cfg.bar[i], 4);
-	pci_write_config(dev, PCIR_BIOS, dinfo->cfg.bios, 4);
-#endif
 	pci_restore_bars(dev);
 	pci_write_config(dev, PCIR_COMMAND, dinfo->cfg.cmdreg, 2);
 	pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1);
@@ -4229,9 +4221,6 @@
 void
 pci_cfg_save(device_t dev, struct pci_devinfo *dinfo, int setstate)
 {
-#if 0
-	int i;
-#endif
 	uint32_t cls;
 	int ps;
 
@@ -4244,11 +4233,6 @@
 	 */
 	if ((dinfo->cfg.hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_NORMAL)
 		return;
-#if 0
-	for (i = 0; i < dinfo->cfg.nummaps; i++)
-		dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_BAR(i), 4);
-	dinfo->cfg.bios = pci_read_config(dev, PCIR_BIOS, 4);
-#endif
 
 	/*
 	 * Some drivers apparently write to these registers w/o updating our