diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-04-12 07:17:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:38 -0400 |
commit | 997ea58eb92f9970b8af7aae48800d0ef43b9423 (patch) | |
tree | 65e021973e5a48ad7290d5be1f441940566468ad /drivers/input/tablet/kbtab.c | |
parent | 48679c6d772b1459a2945729e3a1256ac78fcabf (diff) |
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 | |||
129 | if (!kbtab || !input_dev) | 129 | if (!kbtab || !input_dev) |
130 | goto fail1; | 130 | goto fail1; |
131 | 131 | ||
132 | kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma); | 132 | kbtab->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbtab->data_dma); |
133 | if (!kbtab->data) | 133 | if (!kbtab->data) |
134 | goto fail1; | 134 | goto fail1; |
135 | 135 | ||
@@ -182,7 +182,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
182 | return 0; | 182 | return 0; |
183 | 183 | ||
184 | fail3: usb_free_urb(kbtab->irq); | 184 | fail3: usb_free_urb(kbtab->irq); |
185 | fail2: usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma); | 185 | fail2: usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma); |
186 | fail1: input_free_device(input_dev); | 186 | fail1: input_free_device(input_dev); |
187 | kfree(kbtab); | 187 | kfree(kbtab); |
188 | return error; | 188 | return error; |
@@ -197,7 +197,7 @@ static void kbtab_disconnect(struct usb_interface *intf) | |||
197 | usb_kill_urb(kbtab->irq); | 197 | usb_kill_urb(kbtab->irq); |
198 | input_unregister_device(kbtab->dev); | 198 | input_unregister_device(kbtab->dev); |
199 | usb_free_urb(kbtab->irq); | 199 | usb_free_urb(kbtab->irq); |
200 | usb_buffer_free(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma); | 200 | usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma); |
201 | kfree(kbtab); | 201 | kfree(kbtab); |
202 | } | 202 | } |
203 | } | 203 | } |