Commit 8fb6b188 authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman

staging: brcm80211: Remove abstraction layer for dma alignment

Directly align buffers instead of abstracting it.
Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4766ae6c
...@@ -91,8 +91,6 @@ typedef struct { ...@@ -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);
......
...@@ -285,11 +285,6 @@ uint osl_pci_slot(osl_t *osh) ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment