summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/ehci_pci.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2006-09-07 00:06:42 +0000
committerimp <imp@FreeBSD.org>2006-09-07 00:06:42 +0000
commit28b388f478a97f7ac5d608085d2de2299b5f4940 (patch)
tree6be1b34cd1d3af5d631e1a8c39ca0dd5d0165f89 /sys/dev/usb/ehci_pci.c
parentfb77a38eda0f5fdd90d8c7321017465e50859e84 (diff)
downloadFreeBSD-src-28b388f478a97f7ac5d608085d2de2299b5f4940.zip
FreeBSD-src-28b388f478a97f7ac5d608085d2de2299b5f4940.tar.gz
More removing compatibility macros.
md5 still the same. "Dave, stop. I feel my mind slipping away." -- hal
Diffstat (limited to 'sys/dev/usb/ehci_pci.c')
-rw-r--r--sys/dev/usb/ehci_pci.c6
1 files changed, 3 insertions, 3 deletions
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));
}
}
}
OpenPOWER on IntegriCloud