aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/pcwd_usb.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-04-12 07:17:25 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:38 -0400
commit997ea58eb92f9970b8af7aae48800d0ef43b9423 (patch)
tree65e021973e5a48ad7290d5be1f441940566468ad /drivers/watchdog/pcwd_usb.c
parent48679c6d772b1459a2945729e3a1256ac78fcabf (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/watchdog/pcwd_usb.c')
-rw-r--r--drivers/watchdog/pcwd_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 8e4eacc5bb52..748a74bd85e7 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -600,8 +600,8 @@ static inline void usb_pcwd_delete(struct usb_pcwd_private *usb_pcwd)
600{ 600{
601 usb_free_urb(usb_pcwd->intr_urb); 601 usb_free_urb(usb_pcwd->intr_urb);
602 if (usb_pcwd->intr_buffer != NULL) 602 if (usb_pcwd->intr_buffer != NULL)
603 usb_buffer_free(usb_pcwd->udev, usb_pcwd->intr_size, 603 usb_free_coherent(usb_pcwd->udev, usb_pcwd->intr_size,
604 usb_pcwd->intr_buffer, usb_pcwd->intr_dma); 604 usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
605 kfree(usb_pcwd); 605 kfree(usb_pcwd);
606} 606}
607 607
@@ -671,7 +671,7 @@ static int usb_pcwd_probe(struct usb_interface *interface,
671 le16_to_cpu(endpoint->wMaxPacketSize) : 8); 671 le16_to_cpu(endpoint->wMaxPacketSize) : 8);
672 672
673 /* set up the memory buffer's */ 673 /* set up the memory buffer's */
674 usb_pcwd->intr_buffer = usb_buffer_alloc(udev, usb_pcwd->intr_size, 674 usb_pcwd->intr_buffer = usb_alloc_coherent(udev, usb_pcwd->intr_size,
675 GFP_ATOMIC, &usb_pcwd->intr_dma); 675 GFP_ATOMIC, &usb_pcwd->intr_dma);
676 if (!usb_pcwd->intr_buffer) { 676 if (!usb_pcwd->intr_buffer) {
677 printk(KERN_ERR PFX "Out of memory\n"); 677 printk(KERN_ERR PFX "Out of memory\n");