diff options
| author | Brett Rudley <brudley@broadcom.com> | 2010-10-08 13:57:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 14:32:52 -0700 |
| commit | 40e5c96b229928b28edd99cdb981ff5e74938d19 (patch) | |
| tree | 181ffdcb77e3f47b80dc92205f1d8b0557341fce /drivers | |
| parent | 17b313857dde17c2a122f7a763da335c6378ba1d (diff) | |
staging: brcm80211: Coalesce osl_dma_alloc_consistent between fullmac and softmac
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/brcm80211/include/linux_osl.h | 17 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 20 |
2 files changed, 14 insertions, 23 deletions
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h index ea1de98b59ac..a8ccc74cc4b4 100644 --- a/drivers/staging/brcm80211/include/linux_osl.h +++ b/drivers/staging/brcm80211/include/linux_osl.h @@ -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) +#define DMA_CONSISTENT_ALIGN osl_dma_consistent_align() +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); + #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); + osl_dma_alloc_consistent((osh), (size), (0), (tot), (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 +#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); diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 096f80952196..391f33caafde 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -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) { |