From: Mark Einon Date: Fri, 16 Nov 2012 10:47:38 +0000 (+0000) Subject: staging: et131x: Remove alignment offset padding on DMA buffer allocation/free X-Git-Tag: upstream/snapshot3+hdmi~6135^2~274 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a2bd6b257592cc05e9dd3d36e5810466a075fc3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging: et131x: Remove alignment offset padding on DMA buffer allocation/free This padding was used to align buffers to a 4k boundary when returned from dma_alloc_coherent(). As the buffers are already 4k aligned, and the alignment no longer performed, the padding is not needed. Signed-off-by: Mark Einon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 82ed113..c411d13 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -2291,8 +2291,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) for (id = 0; id < NUM_FBRS; id++) { /* Allocate an area of memory for Free Buffer Ring */ - bufsize = (sizeof(struct fbr_desc) * - rx_ring->fbr[id]->num_entries) + 0xfff; + bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries); rx_ring->fbr[id]->ring_virtaddr = dma_alloc_coherent(&adapter->pdev->dev, bufsize, @@ -2463,8 +2462,7 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter) } bufsize = - (sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries) + - 0xfff; + sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries; dma_free_coherent(&adapter->pdev->dev, bufsize, rx_ring->fbr[id]->ring_virtaddr,