| Message ID | 1335341501-4270-1-git-send-email-agust@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
On Wednesday 25 April 2012 04:11:41 Anatolij Gustschin wrote: > From: Mike Frysinger <vapier@gentoo.org> > > 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. > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > Signed-off-by: Anatolij Gustschin <agust@denx.de> > --- > v2: > - fix build breakage: > In file included from s3c_udc_otg.c:212:0: > s3c_udc_otg_xfer_dma.c: In function 'setdma_tx': > s3c_udc_otg_xfer_dma.c:171:47: error: macro "min_t" requires 3 > arguments, but only 2 given s3c_udc_otg_xfer_dma.c:171:12: error: 'min_t' > undeclared (first use in this function) we'll prob want to merge the mtd/compat.h stuff in to linux/compat.h, like the min_t() macro -mike
Hi Anatolij, > From: Mike Frysinger <vapier@gentoo.org> > > 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. Yes. the include/usb/lin_gadget_compat.h layer. Good idea to provide one compat file (as fair as I remember similar problem is with mtd/compat.h). I'll look into the include/linux.h file.
Hi Lukasz, On Wed, 25 Apr 2012 17:58:51 +0200 Lukasz Majewski <l.majewski@samsung.com> wrote: > Hi Anatolij, > > > From: Mike Frysinger <vapier@gentoo.org> > > > > 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. > > Yes. the include/usb/lin_gadget_compat.h layer. > Good idea to provide one compat file (as fair as I remember similar > problem is with mtd/compat.h). > > I'll look into the include/linux.h file. Mike already moved mtd/compat.h to linux/compat.h, please see this patch http://patchwork.ozlabs.org/patch/151500/ Now I see another issue. In this 4/4 patch we are removing kmalloc: -#define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size) linux/compat.h defines kmalloc() to be malloc(), so the gadget driver should probably use memalign() directly where it is needed? Thanks, Anatolij
Hi Anatolij, > > Hi Anatolij, > > > > > From: Mike Frysinger <vapier@gentoo.org> > > > > > > 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. > > > > Yes. the include/usb/lin_gadget_compat.h layer. > > Good idea to provide one compat file (as fair as I remember similar > > problem is with mtd/compat.h). > > > > I'll look into the include/linux.h file. > > Mike already moved mtd/compat.h to linux/compat.h, please see this > patch http://patchwork.ozlabs.org/patch/151500/ > > Now I see another issue. In this 4/4 patch we are removing kmalloc: > > -#define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size) > > linux/compat.h defines kmalloc() to be malloc(), so the gadget driver > should probably use memalign() directly where it is needed? In the include/usb/lin_gadget_compat.h the #define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size) line is defined. I think that memalign can be used directly, no problem.
Hi Lukasz, On Thu, 26 Apr 2012 12:32:40 +0200 Lukasz Majewski <l.majewski@samsung.com> wrote: ... > > Now I see another issue. In this 4/4 patch we are removing kmalloc: > > > > -#define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size) > > > > linux/compat.h defines kmalloc() to be malloc(), so the gadget driver > > should probably use memalign() directly where it is needed? > > In the include/usb/lin_gadget_compat.h the > > #define kmalloc(size, type) memalign(CONFIG_SYS_CACHELINE_SIZE, size) > line is defined. > > I think that memalign can be used directly, no problem. Okay, I'll change this patch accordingly and will resubmit v3 then. Thanks, Anatolij
diff --git a/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c b/drivers/usb/gadget/s3c_udc_otg_xfer_dma.c index afd4931..56e6e53 100644 --- 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 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);