summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/util
diff options
context:
space:
mode:
authorBrett Rudley2010-11-02 01:10:15 +0100
committerGreg Kroah-Hartman2010-11-10 00:37:32 +0100
commit8fb6b18884703d447af4c5ed1eeec02b489aa54b (patch)
tree7c285fe0fccc9dfb13df9c325bfb2c6a851368d0 /drivers/staging/brcm80211/util
parentstaging: brcm80211: purge epivers.h (diff)
downloadkernel-qcow2-linux-8fb6b18884703d447af4c5ed1eeec02b489aa54b.tar.gz
kernel-qcow2-linux-8fb6b18884703d447af4c5ed1eeec02b489aa54b.tar.xz
kernel-qcow2-linux-8fb6b18884703d447af4c5ed1eeec02b489aa54b.zip
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>
Diffstat (limited to 'drivers/staging/brcm80211/util')
-rw-r--r--drivers/staging/brcm80211/util/linux_osl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index effe043f1962..01851e56b157 100644
--- 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;
}