diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-11 18:33:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-11 18:33:16 +0000 |
| commit | c8d027b7c2c9478cc6134a64ce7f4493c4f31d03 (patch) | |
| tree | d059b171ccae4a9b91e72ce31662e4163fb1e943 /sys/dev/usb/if_cdcef.c | |
| parent | cb538c3cbe26e67bac2b85c75da7259a005d264e (diff) | |
treat usb vendor/product names as a locator, and have usbd_print handle it,
so that it shows up before the :. as a result, all the usb devices do not
need to have name printing code anymore. all this now works and prints
nicely because usbd_probe_and_attach() is serialized. ok kettenis
Diffstat (limited to 'sys/dev/usb/if_cdcef.c')
| -rw-r--r-- | sys/dev/usb/if_cdcef.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index caca58d6a43..39361e29bcb 100644 --- a/sys/dev/usb/if_cdcef.c +++ b/sys/dev/usb/if_cdcef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdcef.c,v 1.17 2007/06/14 06:55:10 mbalmer Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.18 2007/10/11 18:33:14 deraadt Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -142,7 +142,6 @@ cdcef_attach(struct device *parent, struct device *self, void *aux) struct cdcef_softc *sc = (struct cdcef_softc *)self; struct usbf_attach_arg *uaa = aux; usbf_device_handle dev = uaa->device; - char *devinfop; struct ifnet *ifp; usbf_status err; usb_cdc_union_descriptor_t udesc; @@ -155,10 +154,6 @@ cdcef_attach(struct device *parent, struct device *self, void *aux) CDCEF_PRODUCT_ID, CDCEF_DEVICE_CODE, CDCEF_VENDOR_STRING, CDCEF_PRODUCT_STRING, CDCEF_SERIAL_STRING); - devinfop = usbf_devinfo_alloc(dev); - printf(": %s\n", devinfop); - usbf_devinfo_free(devinfop); - /* Fill in the fields needed by the parent device. */ sc->sc_dev.methods = &cdcef_methods; |