USB: rename usb_buffer_alloc() and usb_buffer_free() users

[linux-2.6.git] / drivers / input / mouse / bcm5974.c

diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index b89879bd860f6c08a0deb1ab5a02927b86c1ed5e..6dedded272228131c4a047fa43c0f667215e5370 100644 (file)
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -715,15 +715,15 @@ static int bcm5974_probe(struct usb_interface *iface,
        if (!dev->tp_urb)
                goto err_free_bt_urb;
 
-       dev->bt_data = usb_buffer_alloc(dev->udev,
-                                       dev->cfg.bt_datalen, GFP_KERNEL,
-                                       &dev->bt_urb->transfer_dma);
+       dev->bt_data = usb_alloc_coherent(dev->udev,
+                                         dev->cfg.bt_datalen, GFP_KERNEL,
+                                         &dev->bt_urb->transfer_dma);
        if (!dev->bt_data)
                goto err_free_urb;
 
-       dev->tp_data = usb_buffer_alloc(dev->udev,
-                                       dev->cfg.tp_datalen, GFP_KERNEL,
-                                       &dev->tp_urb->transfer_dma);
+       dev->tp_data = usb_alloc_coherent(dev->udev,
+                                         dev->cfg.tp_datalen, GFP_KERNEL,
+                                         &dev->tp_urb->transfer_dma);
        if (!dev->tp_data)
                goto err_free_bt_buffer;
 
@@ -765,10 +765,10 @@ static int bcm5974_probe(struct usb_interface *iface,
        return 0;
 
 err_free_buffer:
-       usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
+       usb_free_coherent(dev->udev, dev->cfg.tp_datalen,
                dev->tp_data, dev->tp_urb->transfer_dma);
 err_free_bt_buffer:
-       usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
+       usb_free_coherent(dev->udev, dev->cfg.bt_datalen,
                dev->bt_data, dev->bt_urb->transfer_dma);
 err_free_urb:
        usb_free_urb(dev->tp_urb);
@@ -788,10 +788,10 @@ static void bcm5974_disconnect(struct usb_interface *iface)
        usb_set_intfdata(iface, NULL);
 
        input_unregister_device(dev->input);
-       usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
-                       dev->tp_data, dev->tp_urb->transfer_dma);
-       usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
-                       dev->bt_data, dev->bt_urb->transfer_dma);
+       usb_free_coherent(dev->udev, dev->cfg.tp_datalen,
+                         dev->tp_data, dev->tp_urb->transfer_dma);
+       usb_free_coherent(dev->udev, dev->cfg.bt_datalen,
+                         dev->bt_data, dev->bt_urb->transfer_dma);
        usb_free_urb(dev->tp_urb);
        usb_free_urb(dev->bt_urb);
        kfree(dev);