PERFORCE change 192455 for review

[John Baldwin]

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

Change 192455 by jhb at jhb_jhbbsd on 2011/05/02 14:08:20

	Tidy.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#17 edit

Differences ...

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

@@ -75,10 +75,11 @@
     DEVMETHOD(bus_read_ivar,		pcib_read_ivar),
     DEVMETHOD(bus_write_ivar,		pcib_write_ivar),
     DEVMETHOD(bus_alloc_resource,	pcib_alloc_resource),
+#ifdef NEW_PCIB
     DEVMETHOD(bus_adjust_resource,	pcib_adjust_resource),
-#ifdef NEW_PCIB
     DEVMETHOD(bus_release_resource,	pcib_release_resource),
 #else
+    DEVMETHOD(bus_adjust_resource,	bus_generic_adjust_resource),
     DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 #endif
     DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
@@ -1139,6 +1140,18 @@
 }
 
 int
+pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
+    u_long start, u_long end)
+{
+	struct pcib_softc *sc;
+
+	sc = device_get_softc(bus);
+	if (pcib_is_resource_managed(sc, type, r))
+		return (rman_adjust_resource(r, start, end));
+	return (bus_generic_adjust_resource(bus, child, type, r, start, end));
+}
+
+int
 pcib_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
@@ -1314,20 +1327,6 @@
 }
 #endif
 
-int
-pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
-    u_long start, u_long end)
-{
-#ifdef NEW_PCIB
-	struct pcib_softc *sc;
-
-	sc = device_get_softc(bus);
-	if (pcib_is_resource_managed(sc, type, r))
-		return (rman_adjust_resource(r, start, end));
-#endif
-	return (bus_generic_adjust_resource(bus, child, type, r, start, end));
-}
-
 /*
  * PCIB interface.
  */