shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-01 00:36:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: Coalesce osl_dma_alloc_consistent between fullmac and softmac

Browse Source 
Combine dma_alloc routine for full and softmac

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Brett Rudley
2010-10-08 13:57:13 -07:00
committed by Greg Kroah-Hartman
parent 17b313857d
commit 40e5c96b22
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/brcm80211/include/linux_osl.h
View File

@@ -107,20 +107,19 @@ extern uint osl_malloced(osl_t *osh);
#define NATIVE_MALLOC(osh, size) kmalloc(size, GFP_ATOMIC)
#define NATIVE_MFREE(osh, addr, size) kfree(addr)
#ifdef BRCM_FULLMAC
#define DMA_CONSISTENT_ALIGN PAGE_SIZE
#define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
osl_dma_alloc_consistent((osh), (size), (pap))
extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap);
#else
/* allocate/free shared (dma-able) consistent memory */
#define DMA_CONSISTENT_ALIGN osl_dma_consistent_align()
#define DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \
osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap))
extern uint osl_dma_consistent_align(void);
extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align,
uint *tot, unsigned long *pap);
#endif
#ifdef BRCM_FULLMAC
#define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
osl_dma_alloc_consistent((osh), (size), (0), (tot), (pap))
#else
#define DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \
osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap))
#endif /* BRCM_FULLMAC */
#define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
osl_dma_free_consistent((osh), (void *)(va), (size), (pa))
extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa);

20
drivers/staging/brcm80211/util/linux_osl.c
View File

@@ -505,27 +505,19 @@ uint osl_dma_consistent_align(void)
return PAGE_SIZE;
}
#ifdef BRCM_FULLMAC
void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap)
{
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap);
}
#else /* !BRCM_FULLMAC */
void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align_bits,
uint *alloced, unsigned long *pap)
{
u16 align = (1 << align_bits);
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
if (!IS_ALIGNED(DMA_CONSISTENT_ALIGN, align))
size += align;
*alloced = size;
if (align_bits) {
u16 align = (1 << align_bits);
if (!IS_ALIGNED(DMA_CONSISTENT_ALIGN, align))
size += align;
*alloced = size;
}
return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap);
}
#endif /* BRCM_FULLMAC */
void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa)
{