2011-12-21 00:28:39

by Djalal Harouni

Subject: [PATCH] drivers/iwlwifi: use dma_zalloc_coherent() for DMA allocation

Replace dma_alloc_coherent()+memset() with the new dma_zalloc_coherent()

Signed-off-by: Djalal Harouni <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index ce91898..4363da7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -88,18 +88,16 @@ static int iwl_trans_rx_alloc(struct iwl_trans *trans)
return -EINVAL;

/* Allocate the circular buffer of Read Buffer Descriptors (RBDs) */
- rxq->bd = dma_alloc_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,
- &rxq->bd_dma, GFP_KERNEL);
+ rxq->bd = dma_zalloc_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,
+ &rxq->bd_dma, GFP_KERNEL);
if (!rxq->bd)
goto err_bd;
- memset(rxq->bd, 0, sizeof(__le32) * RX_QUEUE_SIZE);

/*Allocate the driver's pointer to receive buffer status */
- rxq->rb_stts = dma_alloc_coherent(dev, sizeof(*rxq->rb_stts),
- &rxq->rb_stts_dma, GFP_KERNEL);
+ rxq->rb_stts = dma_zalloc_coherent(dev, sizeof(*rxq->rb_stts),
+ &rxq->rb_stts_dma, GFP_KERNEL);
if (!rxq->rb_stts)
goto err_rb_stts;
- memset(rxq->rb_stts, 0, sizeof(*rxq->rb_stts));

return 0;

--
1.7.1

2011-12-21 19:45:58

by Djalal Harouni

Subject: Re: [PATCH] drivers/iwlwifi: use dma_zalloc_coherent() for DMA allocation

On Wed, Dec 21, 2011 at 08:52:10AM -0800, Guy, Wey-Yi wrote:
> Hi Djalal,
>
>
> On Tue, 2011-12-20 at 16:21 -0800, Djalal Harouni wrote:
> > Replace dma_alloc_coherent()+memset() with the new dma_zalloc_coherent()
> >
> > Signed-off-by: Djalal Harouni <[email protected]>
> > ---
>
> iwl-trans-pcie.c is one of the source files in iwlwifi driver hold
> dual-license (GPL + BSD), are you ok to release your code for the BSD
> license and relinquish the copyright?
Yes, It's ok.

> btw, we are in the process of rewrite and re-architect major portion of
> iwlwifi driver, and we also plan to make most of the code dual-license
> (GPL + BSD).
>
> Thanks you in advance
>
> Wey
Thanks Wey.

--
tixxdz
http://opendz.org

2011-12-21 17:52:46

by Wey-Yi Guy

Subject: Re: [PATCH] drivers/iwlwifi: use dma_zalloc_coherent() for DMA allocation

Hi Djalal,


On Tue, 2011-12-20 at 16:21 -0800, Djalal Harouni wrote:
> Replace dma_alloc_coherent()+memset() with the new dma_zalloc_coherent()
>
> Signed-off-by: Djalal Harouni <[email protected]>
> ---

iwl-trans-pcie.c is one of the source files in iwlwifi driver hold
dual-license (GPL + BSD), are you ok to release your code for the BSD
license and relinquish the copyright?

btw, we are in the process of rewrite and re-architect major portion of
iwlwifi driver, and we also plan to make most of the code dual-license
(GPL + BSD).

Thanks you in advance

Wey

2011-12-22 01:33:36

by Wey-Yi Guy

Subject: RE: [PATCH] drivers/iwlwifi: use dma_zalloc_coherent() for DMA allocation

Hi Djalal,

>
> iwl-trans-pcie.c is one of the source files in iwlwifi driver hold
> dual-license (GPL + BSD), are you ok to release your code for the BSD
> license and relinquish the copyright?
Yes, It's ok.

Thank you very much

Wey