Remove allocm() and freem() from the USB bus interface now that they

are only used as wrappers around usb_{alloc,free}mem().

ok deraadt@, mglocker@

1 files changed, 1 insertions, 20 deletions

diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index ea817cf562e..be8b5b16de2 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.95 2013/04/16 12:22:49 mpi Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.96 2013/04/19 08:58:53 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 $	*/
 
@@ -167,9 +167,6 @@ void		uhci_rem_loop(struct uhci_softc *sc);
 usbd_status	uhci_setup_isoc(struct usbd_pipe *pipe);
 void		uhci_device_isoc_enter(struct usbd_xfer *);
 
-usbd_status	uhci_allocm(struct usbd_bus *, struct usb_dma *, u_int32_t);
-void		uhci_freem(struct usbd_bus *, struct usb_dma *);
-
 struct usbd_xfer *uhci_allocx(struct usbd_bus *);
 void		uhci_freex(struct usbd_bus *, struct usbd_xfer *);
 
@@ -283,8 +280,6 @@ struct usbd_bus_methods uhci_bus_methods = {
 	uhci_open,
 	uhci_softintr,
 	uhci_poll,
-	uhci_allocm,
-	uhci_freem,
 	uhci_allocx,
 	uhci_freex,
 };
@@ -625,20 +620,6 @@ uhci_detach(struct uhci_softc *sc, int flags)
 	return (rv);
 }
 
-usbd_status
-uhci_allocm(struct usbd_bus *bus, struct usb_dma *dma, u_int32_t size)
-{
-	struct uhci_softc *sc = (struct uhci_softc *)bus;
-
-	return (usb_allocmem(&sc->sc_bus, size, 0, dma));
-}
-
-void
-uhci_freem(struct usbd_bus *bus, struct usb_dma *dma)
-{
-	usb_freemem(&((struct uhci_softc *)bus)->sc_bus, dma);
-}
-
 struct usbd_xfer *
 uhci_allocx(struct usbd_bus *bus)
 {