diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-04-26 02:34:44 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2012-04-30 16:54:51 +0200 |
| commit | 6777a3cf73f621892afe938983918d2aea7730b5 (patch) | |
| tree | 7c14bec563272f70afe3cdca3d589bfe9a6a553d /include | |
| parent | 7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d (diff) | |
| download | u-boot-imx-6777a3cf73f621892afe938983918d2aea7730b5.zip u-boot-imx-6777a3cf73f621892afe938983918d2aea7730b5.tar.gz u-boot-imx-6777a3cf73f621892afe938983918d2aea7730b5.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 3 | ||||
| -rw-r--r-- | include/usb/lin_gadget_compat.h | 15 |
2 files changed, 5 insertions, 13 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 39c693f..593b07f 100644 --- 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 1b937e4..8287b9d 100644 --- 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); |