Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/brcm80211/include/linux_osl.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/brcm80211/util/linux_osl.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

	}