lin_gadget: use common linux/compat.h

Merge our duplicate definitions with the common header.

Also fix drivers/usb/gadget/s3c_udc_otg_xfer_dma.c to
use min() instead of min_t() since we remove the latter
from compat.h.

Additionally use memalign() directly as the lin_gadget
specific kmalloc() macro is removed from lin_gadget_compat.h
by this patch.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>

diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 1050a98b6cd9601d184e7257f32249361d105c2a..9d11aea8e4c4baa40e4169aa8c1dab9ce8d5825f 100644 (file)
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -671,7 +671,7 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
 
        debug("%s: %s %p\n", __func__, ep->name, ep);
 
-       req = kmalloc(sizeof *req, gfp_flags);
+       req = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*req));
        if (!req)
                return 0;
 
@@ -865,7 +865,8 @@ int s3c_udc_probe(struct s3c_plat_otg_data *pdata)
        the_controller = dev;
 
        for (i = 0; i < S3C_MAX_ENDPOINTS+1; i++) {
-               dev->dma_buf[i] = kmalloc(DMA_BUFFER_SIZE, GFP_KERNEL);
+               dev->dma_buf[i] = memalign(CONFIG_SYS_CACHELINE_SIZE,
+                                          DMA_BUFFER_SIZE);
                dev->dma_addr[i] = (dma_addr_t) dev->dma_buf[i];
                invalidate_dcache_range((unsigned long) dev->dma_buf[i],
                                        (unsigned long) (dev->dma_buf[i]

diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
index afd4931fa0c850d0ec53138e79e39d205c51f508..56e6e53de6fb89280872ab653240dd4d5a8ae62c 100644 (file)
--- a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
+++ b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
@@ -168,7 +168,7 @@ int setdma_tx(struct s3c_ep *ep, struct s3c_request *req)
        length = req->req.length - req->req.actual;
 
        if (ep_num == EP0_CON)
-               length = min_t(length, (u32)ep_maxpacket(ep));
+               length = min(length, (u32)ep_maxpacket(ep));
 
        ep->len = length;
        ep->dma_buf = buf;

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 39c693f7a8c0a50ab1addfe1b90696908dd373e1..593b07f4b5db621b79371b8338e59579ba521314 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -48,5 +48,8 @@
 #define BUG_ON(condition) do { if (condition) BUG(); } while(0)
 #endif /* BUG */
 
+#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \
+                                 , __FILE__, __LINE__); }
+
 #define PAGE_SIZE      4096
 #endif

diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h
index 1b937e43a275d0f7e93f9dab1a364cae2d641e35..8287b9de9f97d8a05308ba31ffe4562ae1ead76b 100644 (file)
--- a/include/usb/lin_gadget_compat.h
+++ b/include/usb/lin_gadget_compat.h
@@ -23,6 +23,8 @@
 #ifndef __LIN_COMPAT_H__
 #define __LIN_COMPAT_H__
 
+#include <linux/compat.h>
+
 /* common */
 #define spin_lock_init(...)
 #define spin_lock(...)
@@ -36,25 +38,12 @@
 #define mutex_lock(...)
 #define mutex_unlock(...)
 
-#define WARN_ON(x) if (x) {printf("WARNING in %s line %d\n" \
-                                 , __FILE__, __LINE__); }
-
-#define KERN_WARNING
-#define KERN_ERR
-#define KERN_NOTICE
-#define KERN_DEBUG
-
 #define GFP_KERNEL     0
 
 #define IRQ_HANDLED    1
 
 #define ENOTSUPP       524     /* Operation is not supported */
 
-#define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size)
-#define kfree(addr) free(addr)
-
-#define __iomem
-#define min_t min
 #define dma_cache_maint(addr, size, mode) cache_flush()
 void cache_flush(void);