staging: brcm80211: Remove abstraction layer for dma alignment

Directly align buffers instead of abstracting it.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index b13ae7614042fe8bf66086ed69777478997a68ea..e6d2f30c63caaf727bca1cf8f729bd0f9b5ef7a5 100644 (file)
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -91,8 +91,6 @@ typedef struct {
 
 #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,
                                      uint *tot, unsigned long *pap);
 

diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index effe043f196247e46859c19bcbf3c5dd83a86f0c..01851e56b1573564909212d2661bda855aee0d16 100644 (file)
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -285,11 +285,6 @@ uint osl_pci_slot(osl_t *osh)
        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,
                               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) {
                u16 align = (1 << align_bits);
-               if (!IS_ALIGNED(DMA_CONSISTENT_ALIGN, align))
+               if (!IS_ALIGNED(PAGE_SIZE, align))
                        size += align;
                *alloced = size;
        }