From 013a5bb9863574b94902f5f74ec995bf122b47f5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 29 Apr 2010 15:46:07 -0700 Subject: [PATCH] --- yaml --- r: 195536 b: refs/heads/master c: e26bcf37234c67624f62d9fc95f922b8dbda1363 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/usb.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index e6a6c5eab6d4..05d234ee0563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4d80b7d5220a65cc4e26173d99d4750895f3e64 +refs/heads/master: e26bcf37234c67624f62d9fc95f922b8dbda1363 diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index 88e854cd6b32..d5922a877994 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -1372,18 +1372,6 @@ void *usb_alloc_coherent(struct usb_device *dev, size_t size, void usb_free_coherent(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma); -/* Compatible macros while we switch over */ -static inline void *usb_buffer_alloc(struct usb_device *dev, size_t size, - gfp_t mem_flags, dma_addr_t *dma) -{ - return usb_alloc_coherent(dev, size, mem_flags, dma); -} -static inline void usb_buffer_free(struct usb_device *dev, size_t size, - void *addr, dma_addr_t dma) -{ - return usb_free_coherent(dev, size, addr, dma); -} - #if 0 struct urb *usb_buffer_map(struct urb *urb); void usb_buffer_dmasync(struct urb *urb);