lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: Remove abstraction layer for dma alignment

Browse Source 
Directly align buffers instead of abstracting it.

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-11-01 17:10:15 -07:00
committed by Greg Kroah-Hartman
parent 4766ae6ce7
commit 8fb6b18884
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,8 +91,6 @@ typedef struct {
#define BUS_SWAP32(v) (v) #define BUS_SWAP32(v) (v)
#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, extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align,
uint *tot, unsigned long *pap); uint *tot, unsigned long *pap);

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

@@ -285,11 +285,6 @@ uint osl_pci_slot(osl_t *osh)
return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn); return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn);
} }
uint osl_dma_consistent_align(void)
{
return PAGE_SIZE;
}
void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align_bits, void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align_bits,
uint *alloced, unsigned long *pap) uint *alloced, unsigned long *pap)
{ {
@@ -297,7 +292,7 @@ void *osl_dma_alloc_consistent(osl_t *osh, uint size, u16 align_bits,
if (align_bits) { if (align_bits) {
u16 align = (1 << align_bits); u16 align = (1 << align_bits);
if (!IS_ALIGNED(DMA_CONSISTENT_ALIGN, align)) if (!IS_ALIGNED(PAGE_SIZE, align))
size += align; size += align;
*alloced = size; *alloced = size;
} }