diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 14:49:02 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 14:49:02 +0000 |
| commit | b36c9f662da72870bf22394171cf74a54a7f8e39 (patch) | |
| tree | 2641ee87f027aa978ea64bc95fe33bcf03d1d500 /sys/dev/usb/uark.c | |
| parent | 2bca40ff67d19c516b42ca70c28870f34f7388dc (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/uark.c')
| -rw-r--r-- | sys/dev/usb/uark.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index af1689a52c0..cde4c84d2f4 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.6 2007/06/10 10:53:48 mbalmer Exp $ */ +/* $OpenBSD: uark.c,v 1.7 2007/06/10 14:49:00 mbalmer Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -122,12 +122,12 @@ uark_attach(struct device *parent, struct device *self, void *aux) bzero(&uca, sizeof(uca)); sc->sc_udev = uaa->device; devinfop = usbd_devinfo_alloc(uaa->device, 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); if (usbd_set_config_index(sc->sc_udev, UARK_CONFIG_NO, 1) != 0) { printf("%s: could not set configuration no\n", - USBDEVNAME(sc->sc_dev)); + sc->sc_dev.dv_xname); sc->sc_dying = 1; return; } @@ -137,7 +137,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) &sc->sc_iface); if (error != 0) { printf("%s: could not get interface handle\n", - USBDEVNAME(sc->sc_dev)); + sc->sc_dev.dv_xname); sc->sc_dying = 1; return; } @@ -149,7 +149,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); if (ed == NULL) { printf("%s: no endpoint descriptor found for %d\n", - USBDEVNAME(sc->sc_dev), i); + sc->sc_dev.dv_xname, i); sc->sc_dying = 1; return; } @@ -163,7 +163,7 @@ uark_attach(struct device *parent, struct device *self, void *aux) } if (uca.bulkin == -1 || uca.bulkout == -1) { - printf("%s: missing endpoint\n", USBDEVNAME(sc->sc_dev)); + printf("%s: missing endpoint\n", sc->sc_dev.dv_xname); sc->sc_dying = 1; return; } @@ -326,7 +326,7 @@ uark_break(void *vsc, int portno, int onoff) #ifdef UARK_DEBUG struct uark_softc *sc = vsc; - printf("%s: break %s!\n", USBDEVNAME(sc->sc_dev), + printf("%s: break %s!\n", sc->sc_dev.dv_xname, onoff ? "on" : "off"); if (onoff) |