From owner-p4-projects@FreeBSD.ORG Wed Feb 12 04:45:39 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5BEBB91; Wed, 12 Feb 2014 04:45:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E3C5B8F for ; Wed, 12 Feb 2014 04:45:39 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2ACA71399 for ; Wed, 12 Feb 2014 04:45:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s1C4jdhV028176 for ; Wed, 12 Feb 2014 04:45:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s1C4jcJC028173 for perforce@freebsd.org; Wed, 12 Feb 2014 04:45:39 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Feb 2014 04:45:39 GMT Message-Id: <201402120445.s1C4jcJC028173@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1190881 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.17 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 04:45:39 -0000 http://p4web.freebsd.org/@@1190881?ac=10 Change 1190881 by jhb@jhb_pippin on 2014/02/12 04:44:51 Remove debugging. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci.c#59 edit .. //depot/projects/pci/sys/dev/pci/pci_pci.c#51 edit .. //depot/projects/pci/sys/dev/pci/pci_subr.c#13 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci.c#59 (text+ko) ==== @@ -3288,7 +3288,7 @@ break; } - if (bootverbose || 1) + if (bootverbose) printf("\tsecbus=%d, subbus=%d\n", sec_bus, sub_bus); if (sec_bus > 0 && sub_bus >= sec_bus) { start = sec_bus; @@ -3309,13 +3309,10 @@ rid = 0; res = resource_list_reserve(rl, bus, dev, PCI_RES_BUS, &rid, start, end, count, 0); - if (res != NULL) { - /* XXX */ - pci_printf(cfg, "allocated initial secbus range\n"); + if (res != NULL) return; - } - if (bootverbose || 1) + if (bootverbose) device_printf(bus, "pci%d:%d:%d:%d secbus failed to allocate\n", pci_get_domain(dev), pci_get_bus(dev), ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#51 (text+ko) ==== @@ -584,15 +584,6 @@ rman_get_start(bus->res), rman_get_start(bus->res) + min_count - 1); - /* XXX */ - if (bus->res != NULL) - device_printf(dev, - "allocated secbus range %lu-%lu\n", - rman_get_start(bus->res), rman_get_end(bus->res)); - else - device_printf(dev, - "failed to allocate secondary bus number\n"); - /* * Add the initial resource to the rman. */ @@ -643,7 +634,7 @@ rman_get_start(bus->res), new_end); if (error) return (error); - if (bootverbose || 1) + if (bootverbose) device_printf(bus->dev, "grew bus range to %lu-%lu\n", rman_get_start(bus->res), rman_get_end(bus->res)); error = rman_manage_region(&bus->rman, old_end + 1, @@ -690,7 +681,7 @@ return (NULL); /* Finally, attempt to grow the existing resource. */ - if (bootverbose || 1) { + if (bootverbose) { device_printf(bus->dev, "attempting to grow bus range for %lu buses\n", count); printf("\tback candidate range: %lu-%lu\n", start_free, ==== //depot/projects/pci/sys/dev/pci/pci_subr.c#13 (text+ko) ==== @@ -184,11 +184,7 @@ struct resource_list_entry *rle; int rid; -#ifdef PCI_RES_BUS - if (bootverbose || type == PCI_RES_BUS) -#else if (bootverbose) -#endif device_printf(hr->hr_pcib, "decoding %d %srange %#lx-%#lx\n", type, flags & RF_PREFETCHABLE ? "prefetchable ": "", start, end); @@ -242,11 +238,7 @@ r = bus_generic_alloc_resource(hr->hr_pcib, dev, type, rid, new_start, new_end, count, flags); if (r != NULL) { -#ifdef PCI_RES_BUS - if (bootverbose || type == PCI_RES_BUS) -#else if (bootverbose) -#endif device_printf(hr->hr_pcib, "allocated type %d (%#lx-%#lx) for rid %x of %s\n", type, rman_get_start(r), rman_get_end(r),