2010-10-25 14:30:10

by John W. Linville

Subject: [PATCH] b43: remove extraneous code in free_ringmemory

This code seems to have been cut-n-pasted from alloc_ringmemory?
Anyway, it is useless.

Signed-off-by: John W. Linville <[email protected]>
---
drivers/net/wireless/b43/dma.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 10d0aaf..3d5566e 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -415,11 +415,6 @@ static int alloc_ringmemory(struct b43_dmaring *ring)

static void free_ringmemory(struct b43_dmaring *ring)
{
- gfp_t flags = GFP_KERNEL;
-
- if (ring->type == B43_DMA_64BIT)
- flags |= GFP_DMA;
-
dma_free_coherent(ring->dev->dev->dma_dev, B43_DMA_RINGMEMSIZE,
ring->descbase, ring->dmabase);
}
--
1.7.2.3

2010-10-25 19:45:40

by Michael Büsch

Subject: Re: [PATCH] b43: remove extraneous code in free_ringmemory

On Mon, 2010-10-25 at 10:24 -0400, John W. Linville wrote:
> This code seems to have been cut-n-pasted from alloc_ringmemory?

No. It's leftover from the old SSB DMA mem allocator, which needed
the GFP flags.

> Anyway, it is useless.

ACK.

> Signed-off-by: John W. Linville <[email protected]>
> ---
> drivers/net/wireless/b43/dma.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
> index 10d0aaf..3d5566e 100644
> --- a/drivers/net/wireless/b43/dma.c
> +++ b/drivers/net/wireless/b43/dma.c
> @@ -415,11 +415,6 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
>
> static void free_ringmemory(struct b43_dmaring *ring)
> {
> - gfp_t flags = GFP_KERNEL;
> -
> - if (ring->type == B43_DMA_64BIT)
> - flags |= GFP_DMA;
> -
> dma_free_coherent(ring->dev->dev->dma_dev, B43_DMA_RINGMEMSIZE,
> ring->descbase, ring->dmabase);
> }


--
Greetings Michael.