1 files changed, 1 insertions, 38 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index fcb5526cb085..f2fbdc7fe376 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -497,38 +497,6 @@ dummy_free_request (struct usb_ep *_ep, struct usb_request *_req)
         kfree (req);
 }
 
-static void *
-dummy_alloc_buffer (
-        struct usb_ep *_ep,
-        unsigned bytes,
-        dma_addr_t *dma,
-        gfp_t mem_flags
-) {
-        char                    *retval;
-        struct dummy_ep         *ep;
-        struct dummy            *dum;
-
-        ep = usb_ep_to_dummy_ep (_ep);
-        dum = ep_to_dummy (ep);
-
-        if (!dum->driver)
-                return NULL;
-        retval = kmalloc (bytes, mem_flags);
-        *dma = (dma_addr_t) retval;
-        return retval;
-}
-
-static void
-dummy_free_buffer (
-        struct usb_ep *_ep,
-        void *buf,
-        dma_addr_t dma,
-        unsigned bytes
-) {
-        if (bytes)
-                kfree (buf);
-}
-
 static void
 fifo_complete (struct usb_ep *ep, struct usb_request *req)
 {
@@ -659,10 +627,6 @@ static const struct usb_ep_ops dummy_ep_ops = {
         .alloc_request  = dummy_alloc_request,
         .free_request   = dummy_free_request,
 
-        .alloc_buffer   = dummy_alloc_buffer,
-        .free_buffer    = dummy_free_buffer,
-        /* map, unmap, ... eventually hook the "generic" dma calls */
-
         .queue          = dummy_queue,
         .dequeue        = dummy_dequeue,
 
@@ -1784,8 +1748,7 @@ static int dummy_bus_resume (struct usb_hcd *hcd)
 
         spin_lock_irq (&dum->lock);
         if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
-                dev_warn (&hcd->self.root_hub->dev, "HC isn't running!\n");
-                rc = -ENODEV;
+                rc = -ESHUTDOWN;
         } else {
                 dum->rh_state = DUMMY_RH_RUNNING;
                 set_link_state (dum);