diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-04-16 12:10:04 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-04-16 12:10:04 +0000 |
| commit | d72a172b8b545604756d7d9fc94d3c95a2cd4d7f (patch) | |
| tree | ce32253170fb82816e7cbbb67497f05634eefb36 /sys/dev | |
| parent | c9ee596e7bc1deffd739f9e00c0123d9acb546dc (diff) | |
Merge ohci_hash_rem_td() into ohci_free_std() to reduce differences with
uhci(4). No functional change.
ok mglocker@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ohci.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 4411ba127a7..c107697d36e 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.109 2013/04/15 09:23:01 mglocker Exp $ */ +/* $OpenBSD: ohci.c,v 1.110 2013/04/16 12:10:03 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 $ */ @@ -111,7 +111,6 @@ usbd_status ohci_device_request(struct usbd_xfer *xfer); void ohci_add_ed(struct ohci_soft_ed *, struct ohci_soft_ed *); void ohci_rem_ed(struct ohci_soft_ed *, struct ohci_soft_ed *); void ohci_hash_add_td(struct ohci_softc *, struct ohci_soft_td *); -void ohci_hash_rem_td(struct ohci_softc *, struct ohci_soft_td *); struct ohci_soft_td *ohci_hash_find_td(struct ohci_softc *, ohci_physaddr_t); void ohci_hash_add_itd(struct ohci_softc *, struct ohci_soft_itd *); void ohci_hash_rem_itd(struct ohci_softc *, struct ohci_soft_itd *); @@ -496,7 +495,7 @@ ohci_free_std(struct ohci_softc *sc, struct ohci_soft_td *std) int s; s = splusb(); - ohci_hash_rem_td(sc, std); + LIST_REMOVE(std, hnext); std->nexttd = sc->sc_freetds; sc->sc_freetds = std; splx(s); @@ -1819,15 +1818,6 @@ ohci_hash_add_td(struct ohci_softc *sc, struct ohci_soft_td *std) LIST_INSERT_HEAD(&sc->sc_hash_tds[h], std, hnext); } -/* Called at splusb() */ -void -ohci_hash_rem_td(struct ohci_softc *sc, struct ohci_soft_td *std) -{ - SPLUSBCHECK; - - LIST_REMOVE(std, hnext); -} - struct ohci_soft_td * ohci_hash_find_td(struct ohci_softc *sc, ohci_physaddr_t a) { |