PERFORCE change 191792 for review

[John Baldwin]

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

Change 191792 by jhb at jhb_jhbbsd on 2011/04/19 17:42:47

	Cleanups.

Affected files ...

.. //depot/projects/pci/sys/dev/cardbus/cardbus.c#2 edit
.. //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#3 edit

Differences ...

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

@@ -317,7 +317,6 @@
 
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	cardbus_read_ivar),
-	DEVMETHOD(bus_write_ivar,	pci_write_ivar),
 	DEVMETHOD(bus_driver_added,	cardbus_driver_added),
 
 	/* Card Interface */

==== //depot/projects/pci/sys/dev/cardbus/cardbus_cis.c#3 (text+ko) ====

@@ -324,7 +324,7 @@
 		 * hint when the cardbus bridge is a child of pci0 (the main
 		 * bus).  The PC Card spec seems to indicate that this should
 		 * only be done on x86 based machines, which suggests that on
-		 * non-x86 machines the adddresses can be anywhere.  Since the
+		 * non-x86 machines the addresses can be anywhere.  Since the
 		 * hardware can do it on non-x86 machines, it should be able
 		 * to do it on x86 machines too.  Therefore, we can and should
 		 * ignore this hint.  Furthermore, the PC Card spec recommends
@@ -470,7 +470,7 @@
 	}
 
 	/* allocate the memory space to read CIS */
-	res = bus_alloc_resource(child, SYS_RES_MEMORY, rid, 0, ~0, 1,
+	res = bus_alloc_resource_any(child, SYS_RES_MEMORY, rid,
 	    rman_make_alignment_flags(4096) | RF_ACTIVE);
 	if (res == NULL) {
 		device_printf(cbdev, "Unable to allocate resource "