diff options
| author | Daniel Mack | 2010-04-12 13:17:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-20 22:21:38 +0200 |
| commit | 997ea58eb92f9970b8af7aae48800d0ef43b9423 (patch) | |
| tree | 65e021973e5a48ad7290d5be1f441940566468ad /drivers/input/tablet/kbtab.c | |
| parent | USB: Short new 'graph for usb-serial.txt (diff) | |
| download | kernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.tar.gz kernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.tar.xz kernel-qcow2-linux-997ea58eb92f9970b8af7aae48800d0ef43b9423.zip | |
USB: rename usb_buffer_alloc() and usb_buffer_free() users
For more clearance what the functions actually do,
usb_buffer_alloc() is renamed to usb_alloc_coherent()
usb_buffer_free() is renamed to usb_free_coherent()
They should only be used in code which really needs DMA coherency.
All call sites have been changed accordingly, except for staging
drivers.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/input/tablet/kbtab.c')
| -rw-r--r-- | drivers/input/tablet/kbtab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index 6682b17bf844..d31b9c793554 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c @@ -129,7 +129,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i if (!kbtab || !input_dev) goto fail1; - kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma); + kbtab->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbtab->data_dma); if (!kbtab->data) goto fail1; @@ -182,7 +182,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i return 0; fail3: usb_free_urb(kbtab->irq); - fail2: usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma); + fail2: usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma); fail1: input_free_device(input_dev); kfree(kbtab); return error; @@ -197,7 +197,7 @@ static void kbtab_disconnect(struct usb_interface *intf) usb_kill_urb(kbtab->irq); input_unregister_device(kbtab->dev); usb_free_urb(kbtab->irq); - usb_buffer_free(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma); + usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma); kfree(kbtab); } } |