2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 198bb3ed95b2..1943be5a2914 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -201,8 +201,8 @@ static int onetouch_connect_input(struct us_data *ss)
         if (!onetouch || !input_dev)
                 goto fail1;
 
-        onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN,
-                                          GFP_KERNEL, &onetouch->data_dma);
+        onetouch->data = usb_alloc_coherent(udev, ONETOUCH_PKT_LEN,
+                                            GFP_KERNEL, &onetouch->data_dma);
         if (!onetouch->data)
                 goto fail1;
 
@@ -264,8 +264,8 @@ static int onetouch_connect_input(struct us_data *ss)
         return 0;
 
  fail3: usb_free_urb(onetouch->irq);
- fail2: usb_buffer_free(udev, ONETOUCH_PKT_LEN,
-                        onetouch->data, onetouch->data_dma);
+ fail2: usb_free_coherent(udev, ONETOUCH_PKT_LEN,
+                          onetouch->data, onetouch->data_dma);
  fail1: kfree(onetouch);
         input_free_device(input_dev);
         return error;
@@ -279,8 +279,8 @@ static void onetouch_release_input(void *onetouch_)
                 usb_kill_urb(onetouch->irq);
                 input_unregister_device(onetouch->dev);
                 usb_free_urb(onetouch->irq);
-                usb_buffer_free(onetouch->udev, ONETOUCH_PKT_LEN,
-                                onetouch->data, onetouch->data_dma);
+                usb_free_coherent(onetouch->udev, ONETOUCH_PKT_LEN,
+                                  onetouch->data, onetouch->data_dma);
         }
 }
 
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index c54a370c76c5..e2798ef2dd19 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -414,7 +414,7 @@ static int associate_dev(struct us_data *us, struct usb_interface *intf)
                 return -ENOMEM;
         }
 
-        us->iobuf = usb_buffer_alloc(us->pusb_dev, US_IOBUF_SIZE,
+        us->iobuf = usb_alloc_coherent(us->pusb_dev, US_IOBUF_SIZE,
                         GFP_KERNEL, &us->iobuf_dma);
         if (!us->iobuf) {
                 US_DEBUGP("I/O buffer allocation failed\n");
@@ -758,7 +758,7 @@ static void dissociate_dev(struct us_data *us)
 
         /* Free the buffers */
         kfree(us->cr);
-        usb_buffer_free(us->pusb_dev, US_IOBUF_SIZE, us->iobuf, us->iobuf_dma);
+        usb_free_coherent(us->pusb_dev, US_IOBUF_SIZE, us->iobuf, us->iobuf_dma);
 
         /* Remove our private data from the interface */
         usb_set_intfdata(us->pusb_intf, NULL);