summaryrefslogtreecommitdiff
path: root/sys/dev/usb/udcf.c
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-10 14:49:02 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-10 14:49:02 +0000
commitb36c9f662da72870bf22394171cf74a54a7f8e39 (patch)
tree2641ee87f027aa978ea64bc95fe33bcf03d1d500 /sys/dev/usb/udcf.c
parent2bca40ff67d19c516b42ca70c28870f34f7388dc (diff)
Remove the definition and use of the USBDEVNAME macro.
(This might look easy, but it was a big diff. Thanks to dlg and especially jsg for looking over it; we found at least four mistakes in the initial diff.) ok jsg.
Diffstat (limited to 'sys/dev/usb/udcf.c')
-rw-r--r--sys/dev/usb/udcf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 54c50582db3..7cccb53840d 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udcf.c,v 1.35 2007/06/10 10:53:48 mbalmer Exp $ */
+/* $OpenBSD: udcf.c,v 1.36 2007/06/10 14:49:00 mbalmer Exp $ */
/*
* Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -165,18 +165,18 @@ udcf_attach(struct device *parent, struct device *self, void *aux)
if ((err = usbd_set_config_index(dev, 0, 1))) {
DPRINTF(("\n%s: failed to set configuration, err=%s\n",
- USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
+ sc->sc_dev.dv_xname, usbd_errstr(err)));
goto fishy;
}
if ((err = usbd_device2interface_handle(dev, 0, &iface))) {
DPRINTF(("\n%s: failed to get interface, err=%s\n",
- USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
+ sc->sc_dev.dv_xname, usbd_errstr(err)));
goto fishy;
}
devinfop = usbd_devinfo_alloc(dev, 0);
- printf("\n%s: %s\n", USBDEVNAME(sc->sc_dev), devinfop);
+ printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
usbd_devinfo_free(devinfop);
id = usbd_get_interface_descriptor(iface);
@@ -197,7 +197,7 @@ udcf_attach(struct device *parent, struct device *self, void *aux)
sc->sc_last = 0L;
sc->sc_last_tv.tv_sec = 0L;
- strlcpy(sc->sc_sensordev.xname, USBDEVNAME(sc->sc_dev),
+ strlcpy(sc->sc_sensordev.xname, sc->sc_dev.dv_xname,
sizeof(sc->sc_sensordev.xname));
sc->sc_sensor.type = SENSOR_TIMEDELTA;