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/acecad.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/acecad.c')
-rw-r--r-- | drivers/input/tablet/acecad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c index 670c61c5a516..c0470163dc67 100644 --- a/drivers/input/tablet/acecad.c +++ b/drivers/input/tablet/acecad.c | |||
@@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
155 | goto fail1; | 155 | goto fail1; |
156 | } | 156 | } |
157 | 157 | ||
158 | acecad->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &acecad->data_dma); | 158 | acecad->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &acecad->data_dma); |
159 | if (!acecad->data) { | 159 | if (!acecad->data) { |
160 | err= -ENOMEM; | 160 | err= -ENOMEM; |
161 | goto fail1; | 161 | goto fail1; |
@@ -241,7 +241,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
241 | 241 | ||
242 | return 0; | 242 | return 0; |
243 | 243 | ||
244 | fail2: usb_buffer_free(dev, 8, acecad->data, acecad->data_dma); | 244 | fail2: usb_free_coherent(dev, 8, acecad->data, acecad->data_dma); |
245 | fail1: input_free_device(input_dev); | 245 | fail1: input_free_device(input_dev); |
246 | kfree(acecad); | 246 | kfree(acecad); |
247 | return err; | 247 | return err; |
@@ -256,7 +256,7 @@ static void usb_acecad_disconnect(struct usb_interface *intf) | |||
256 | usb_kill_urb(acecad->irq); | 256 | usb_kill_urb(acecad->irq); |
257 | input_unregister_device(acecad->input); | 257 | input_unregister_device(acecad->input); |
258 | usb_free_urb(acecad->irq); | 258 | usb_free_urb(acecad->irq); |
259 | usb_buffer_free(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma); | 259 | usb_free_coherent(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma); |
260 | kfree(acecad); | 260 | kfree(acecad); |
261 | } | 261 | } |
262 | } | 262 | } |