lkml.org 
[lkml]   [2013]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/62] dmaengine: convert to idr_alloc()
    Date
    Convert to the much saner new idr interface.

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Dan Williams <djbw@fb.com>
    ---
    This patch depends on an earlier idr changes and I think it would be
    best to route these together through -mm. Please holler if there's
    any objection. Thanks.

    drivers/dma/dmaengine.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
    index a815d44..381aa2c 100644
    --- a/drivers/dma/dmaengine.c
    +++ b/drivers/dma/dmaengine.c
    @@ -667,18 +667,14 @@ static int get_dma_id(struct dma_device *device)
    {
    int rc;

    - idr_retry:
    - if (!idr_pre_get(&dma_idr, GFP_KERNEL))
    - return -ENOMEM;
    mutex_lock(&dma_list_mutex);
    - rc = idr_get_new(&dma_idr, NULL, &device->dev_id);
    - mutex_unlock(&dma_list_mutex);
    - if (rc == -EAGAIN)
    - goto idr_retry;
    - else if (rc != 0)
    - return rc;

    - return 0;
    + rc = idr_alloc(&dma_idr, NULL, 0, 0, GFP_KERNEL);
    + if (rc >= 0)
    + device->dev_id = rc;
    +
    + mutex_unlock(&dma_list_mutex);
    + return rc < 0 ? rc : 0;
    }

    /**
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-03 03:01    [W:4.020 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site