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/touchscreen/usbtouchscreen.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/touchscreen/usbtouchscreen.c')
-rw-r--r-- | drivers/input/touchscreen/usbtouchscreen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 99330bbdbac7..ea41a851ddfd 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c | |||
@@ -1291,8 +1291,8 @@ static void usbtouch_close(struct input_dev *input) | |||
1291 | static void usbtouch_free_buffers(struct usb_device *udev, | 1291 | static void usbtouch_free_buffers(struct usb_device *udev, |
1292 | struct usbtouch_usb *usbtouch) | 1292 | struct usbtouch_usb *usbtouch) |
1293 | { | 1293 | { |
1294 | usb_buffer_free(udev, usbtouch->type->rept_size, | 1294 | usb_free_coherent(udev, usbtouch->type->rept_size, |
1295 | usbtouch->data, usbtouch->data_dma); | 1295 | usbtouch->data, usbtouch->data_dma); |
1296 | kfree(usbtouch->buffer); | 1296 | kfree(usbtouch->buffer); |
1297 | } | 1297 | } |
1298 | 1298 | ||
@@ -1336,8 +1336,8 @@ static int usbtouch_probe(struct usb_interface *intf, | |||
1336 | if (!type->process_pkt) | 1336 | if (!type->process_pkt) |
1337 | type->process_pkt = usbtouch_process_pkt; | 1337 | type->process_pkt = usbtouch_process_pkt; |
1338 | 1338 | ||
1339 | usbtouch->data = usb_buffer_alloc(udev, type->rept_size, | 1339 | usbtouch->data = usb_alloc_coherent(udev, type->rept_size, |
1340 | GFP_KERNEL, &usbtouch->data_dma); | 1340 | GFP_KERNEL, &usbtouch->data_dma); |
1341 | if (!usbtouch->data) | 1341 | if (!usbtouch->data) |
1342 | goto out_free; | 1342 | goto out_free; |
1343 | 1343 | ||