From 28b388f478a97f7ac5d608085d2de2299b5f4940 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 7 Sep 2006 00:06:42 +0000 Subject: More removing compatibility macros. md5 still the same. "Dave, stop. I feel my mind slipping away." -- hal --- sys/dev/usb/ehci_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/usb/ehci_pci.c') diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c index 6ed26140..357ea6f 100644 --- a/sys/dev/usb/ehci_pci.c +++ b/sys/dev/usb/ehci_pci.c @@ -414,7 +414,7 @@ ehci_pci_attach(device_t self) continue; bsc = device_get_softc(nbus[0]); DPRINTF(("ehci_pci_attach: companion %s\n", - USBDEVNAME(bsc->bdev))); + device_get_nameunit(bsc->bdev))); sc->sc_comps[ncomp++] = bsc; if (ncomp >= EHCI_COMPANION_MAX) break; @@ -526,7 +526,7 @@ ehci_pci_takecontroller(device_t self) pci_write_config(self, eecp, legsup | EHCI_LEGSUP_OSOWNED, 4); if (legsup & EHCI_LEGSUP_BIOSOWNED) { printf("%s: waiting for BIOS to give up control\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); for (i = 0; i < 5000; i++) { legsup = pci_read_config(self, eecp, 4); if ((legsup & EHCI_LEGSUP_BIOSOWNED) == 0) @@ -535,7 +535,7 @@ ehci_pci_takecontroller(device_t self) } if (legsup & EHCI_LEGSUP_BIOSOWNED) printf("%s: timed out waiting for BIOS\n", - USBDEVNAME(sc->sc_bus.bdev)); + device_get_nameunit(sc->sc_bus.bdev)); } } } -- cgit v1.1