diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 5078c0c97f20..e962a7d4375e 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.89 2001/11/10 17:10:42 augustss Exp $ */ +/* $NetBSD: usb_subr.c,v 1.90 2001/11/10 17:11:38 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -723,7 +723,6 @@ usbd_setup_pipe(usbd_device_handle dev, usbd_interface_handle iface, p->repeat = 0; p->interval = ival; SIMPLEQ_INIT(&p->queue); - usb_callout_init(p->abort_handle); err = dev->bus->methods->open_pipe(p); if (err) { DPRINTFN(-1,("usbd_setup_pipe: endpoint=0x%x failed, error=" diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 4bf3a13c5ecb..9070ae51af57 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -220,12 +220,6 @@ usbd_close_pipe(usbd_pipe_handle pipe) LIST_REMOVE(pipe, next); pipe->endpoint->refcnt--; pipe->methods->close(pipe); -#if defined(__NetBSD__) && defined(DIAGNOSTIC) - if (callout_pending(&pipe->abort_handle)) { - callout_stop(&pipe->abort_handle); - printf("usbd_close_pipe: abort_handle pending"); - } -#endif if (pipe->intrxfer != NULL) usbd_free_xfer(pipe->intrxfer); free(pipe, M_USB); diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index bc39792b9189..d349d8b40d73 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -175,8 +175,6 @@ struct usbd_pipe { char repeat; int interval; - usb_callout_t abort_handle; - /* Filled by HC driver. */ struct usbd_pipe_methods *methods; };