lkml.org 
[lkml]   [2014]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -next 06/26] dma: Use dma_zalloc_coherent
    Date
    Use the zeroing function instead of dma_alloc_coherent & memset(,0,)

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/dma/imx-sdma.c | 5 ++---
    drivers/dma/mxs-dma.c | 8 +++-----
    2 files changed, 5 insertions(+), 8 deletions(-)

    diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
    index 1287146..4758725 100644
    --- a/drivers/dma/imx-sdma.c
    +++ b/drivers/dma/imx-sdma.c
    @@ -904,14 +904,13 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
    int channel = sdmac->channel;
    int ret = -EBUSY;

    - sdmac->bd = dma_alloc_coherent(NULL, PAGE_SIZE, &sdmac->bd_phys, GFP_KERNEL);
    + sdmac->bd = dma_zalloc_coherent(NULL, PAGE_SIZE, &sdmac->bd_phys,
    + GFP_KERNEL);
    if (!sdmac->bd) {
    ret = -ENOMEM;
    goto out;
    }

    - memset(sdmac->bd, 0, PAGE_SIZE);
    -
    sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;
    sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;

    diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
    index ead4913..dc1dba7 100644
    --- a/drivers/dma/mxs-dma.c
    +++ b/drivers/dma/mxs-dma.c
    @@ -413,16 +413,14 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
    struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
    int ret;

    - mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,
    - CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,
    - GFP_KERNEL);
    + mxs_chan->ccw = dma_zalloc_coherent(mxs_dma->dma_device.dev,
    + CCW_BLOCK_SIZE,
    + &mxs_chan->ccw_phys, GFP_KERNEL);
    if (!mxs_chan->ccw) {
    ret = -ENOMEM;
    goto err_alloc;
    }

    - memset(mxs_chan->ccw, 0, CCW_BLOCK_SIZE);
    -
    if (mxs_chan->chan_irq != NO_IRQ) {
    ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,
    0, "mxs-dma", mxs_dma);
    --
    1.8.1.2.459.gbcd45b4.dirty


    \
     
     \ /
      Last update: 2014-06-15 23:01    [W:4.098 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site