[src/trunk]: src/sys/dev/usb Get rid of unused abort_handle.

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31f3051269a6
branches:  trunk
changeset: 517322:31f3051269a6
user:      augustss <augustss%NetBSD.org@localhost>
date:      Sat Nov 10 17:11:38 2001 +0000

description:
Get rid of unused abort_handle.

diffstat:

 sys/dev/usb/usb_subr.c |  3 +--
 sys/dev/usb/usbdi.c    |  8 +-------
 sys/dev/usb/usbdivar.h |  4 +---
 3 files changed, 3 insertions(+), 12 deletions(-)

diffs (57 lines):

diff -r 121a24a5b596 -r 31f3051269a6 sys/dev/usb/usb_subr.c
--- a/sys/dev/usb/usb_subr.c    Sat Nov 10 17:10:42 2001 +0000
+++ b/sys/dev/usb/usb_subr.c    Sat Nov 10 17:11:38 2001 +0000
@@ -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: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $   */
 
 /*
@@ -724,7 +724,6 @@
        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 -r 121a24a5b596 -r 31f3051269a6 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Sat Nov 10 17:10:42 2001 +0000
+++ b/sys/dev/usb/usbdi.c       Sat Nov 10 17:11:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.82 2001/11/10 16:54:56 augustss Exp $      */
+/*     $NetBSD: usbdi.c,v 1.83 2001/11/10 17:11:38 augustss Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $      */
 
 /*
@@ -269,12 +269,6 @@
        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 -r 121a24a5b596 -r 31f3051269a6 sys/dev/usb/usbdivar.h
--- a/sys/dev/usb/usbdivar.h    Sat Nov 10 17:10:42 2001 +0000
+++ b/sys/dev/usb/usbdivar.h    Sat Nov 10 17:11:38 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdivar.h,v 1.64 2001/11/10 16:54:56 augustss Exp $   */
+/*     $NetBSD: usbdivar.h,v 1.65 2001/11/10 17:11:38 augustss Exp $   */
 /*     $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $   */
 
 /*
@@ -176,8 +176,6 @@
        char                    repeat;
        int                     interval;
 
-       usb_callout_t           abort_handle;
-
        /* Filled by HC driver. */
        struct usbd_pipe_methods *methods;
 };