diff options
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ehci.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 12 |
3 files changed, 3 insertions, 33 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 18f4f3ee91e..568ccebc6d9 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.157 2014/06/04 12:28:21 mpi Exp $ */ +/* $OpenBSD: ehci.c,v 1.158 2014/06/04 13:52:30 mpi Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -152,7 +152,6 @@ void ehci_device_isoc_close(struct usbd_pipe *); void ehci_device_isoc_done(struct usbd_xfer *); void ehci_device_clear_toggle(struct usbd_pipe *pipe); -void ehci_noop(struct usbd_pipe *pipe); void ehci_pcd(struct ehci_softc *, struct usbd_xfer *); void ehci_disown(struct ehci_softc *, int, int); @@ -228,7 +227,6 @@ struct usbd_pipe_methods ehci_root_ctrl_methods = { .start = ehci_root_ctrl_start, .abort = ehci_root_ctrl_abort, .close = ehci_root_ctrl_close, - .cleartoggle = ehci_noop, .done = ehci_root_ctrl_done, }; @@ -237,7 +235,6 @@ struct usbd_pipe_methods ehci_root_intr_methods = { .start = ehci_root_intr_start, .abort = ehci_root_intr_abort, .close = ehci_root_intr_close, - .cleartoggle = ehci_noop, .done = ehci_root_intr_done, }; @@ -246,7 +243,6 @@ struct usbd_pipe_methods ehci_device_ctrl_methods = { .start = ehci_device_ctrl_start, .abort = ehci_device_ctrl_abort, .close = ehci_device_ctrl_close, - .cleartoggle = ehci_noop, .done = ehci_device_ctrl_done, }; @@ -273,7 +269,6 @@ struct usbd_pipe_methods ehci_device_isoc_methods = { .start = ehci_device_isoc_start, .abort = ehci_device_isoc_abort, .close = ehci_device_isoc_close, - .cleartoggle = ehci_noop, .done = ehci_device_isoc_done, }; @@ -1226,11 +1221,6 @@ ehci_device_clear_toggle(struct usbd_pipe *pipe) epipe->sqh->qh.qh_qtd.qtd_status &= htole32(~EHCI_QTD_TOGGLE_MASK); } -void -ehci_noop(struct usbd_pipe *pipe) -{ -} - #ifdef EHCI_DEBUG void ehci_dump_regs(struct ehci_softc *sc) diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index c0f6af1025f..97b04e5945f 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.132 2014/06/04 12:28:21 mpi Exp $ */ +/* $OpenBSD: ohci.c,v 1.133 2014/06/04 13:52:30 mpi Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -157,7 +157,6 @@ void ohci_close_pipe(struct usbd_pipe *, struct ohci_soft_ed *); void ohci_abort_xfer(struct usbd_xfer *, usbd_status); void ohci_device_clear_toggle(struct usbd_pipe *pipe); -void ohci_noop(struct usbd_pipe *pipe); #ifdef OHCI_DEBUG void ohci_dumpregs(struct ohci_softc *); @@ -244,7 +243,6 @@ struct usbd_pipe_methods ohci_root_ctrl_methods = { .start = ohci_root_ctrl_start, .abort = ohci_root_ctrl_abort, .close = ohci_root_ctrl_close, - .cleartoggle = ohci_noop, .done = ohci_root_ctrl_done, }; @@ -253,7 +251,6 @@ struct usbd_pipe_methods ohci_root_intr_methods = { .start = ohci_root_intr_start, .abort = ohci_root_intr_abort, .close = ohci_root_intr_close, - .cleartoggle = ohci_noop, .done = ohci_root_intr_done, }; @@ -262,7 +259,6 @@ struct usbd_pipe_methods ohci_device_ctrl_methods = { .start = ohci_device_ctrl_start, .abort = ohci_device_ctrl_abort, .close = ohci_device_ctrl_close, - .cleartoggle = ohci_noop, .done = ohci_device_ctrl_done, }; @@ -289,7 +285,6 @@ struct usbd_pipe_methods ohci_device_isoc_methods = { .start = ohci_device_isoc_start, .abort = ohci_device_isoc_abort, .close = ohci_device_isoc_close, - .cleartoggle = ohci_noop, .done = ohci_device_isoc_done, }; @@ -2703,11 +2698,6 @@ ohci_device_clear_toggle(struct usbd_pipe *pipe) opipe->sed->ed.ed_headp &= htole32(~OHCI_TOGGLECARRY); } -void -ohci_noop(struct usbd_pipe *pipe) -{ -} - usbd_status ohci_device_bulk_transfer(struct usbd_xfer *xfer) { diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index fe1dc3979f6..51706c7ff2e 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.123 2014/06/04 12:28:21 mpi Exp $ */ +/* $OpenBSD: uhci.c,v 1.124 2014/06/04 13:52:30 mpi Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -191,7 +191,6 @@ usbd_status uhci_device_setintr(struct uhci_softc *sc, struct uhci_pipe *pipe, int ival); void uhci_device_clear_toggle(struct usbd_pipe *pipe); -void uhci_noop(struct usbd_pipe *pipe); __inline__ struct uhci_soft_qh *uhci_find_prev_qh(struct uhci_soft_qh *, struct uhci_soft_qh *); @@ -262,7 +261,6 @@ struct usbd_pipe_methods uhci_root_ctrl_methods = { .start = uhci_root_ctrl_start, .abort = uhci_root_ctrl_abort, .close = uhci_root_ctrl_close, - .cleartoggle = uhci_noop, .done = uhci_root_ctrl_done, }; @@ -271,7 +269,6 @@ struct usbd_pipe_methods uhci_root_intr_methods = { .start = uhci_root_intr_start, .abort = uhci_root_intr_abort, .close = uhci_root_intr_close, - .cleartoggle = uhci_noop, .done = uhci_root_intr_done, }; @@ -280,7 +277,6 @@ struct usbd_pipe_methods uhci_device_ctrl_methods = { .start = uhci_device_ctrl_start, .abort = uhci_device_ctrl_abort, .close = uhci_device_ctrl_close, - .cleartoggle = uhci_noop, .done = uhci_device_ctrl_done, }; @@ -307,7 +303,6 @@ struct usbd_pipe_methods uhci_device_isoc_methods = { .start = uhci_device_isoc_start, .abort = uhci_device_isoc_abort, .close = uhci_device_isoc_close, - .cleartoggle = uhci_noop, .done = uhci_device_isoc_done, }; @@ -1631,11 +1626,6 @@ uhci_device_clear_toggle(struct usbd_pipe *pipe) upipe->nexttoggle = 0; } -void -uhci_noop(struct usbd_pipe *pipe) -{ -} - usbd_status uhci_device_bulk_transfer(struct usbd_xfer *xfer) { |