lkml.org 
[lkml]   [2013]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 34/77] drm/sis: 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: David Airlie <airlied@linux.ie>
    Cc: dri-devel@lists.freedesktop.org
    ---
    drivers/gpu/drm/sis/sis_mm.c | 13 +++----------
    1 file changed, 3 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
    index 2b2f78c..9a43d98 100644
    --- a/drivers/gpu/drm/sis/sis_mm.c
    +++ b/drivers/gpu/drm/sis/sis_mm.c
    @@ -128,17 +128,10 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
    if (retval)
    goto fail_alloc;

    -again:
    - if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
    - retval = -ENOMEM;
    - goto fail_idr;
    - }
    -
    - retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key);
    - if (retval == -EAGAIN)
    - goto again;
    - if (retval)
    + retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
    + if (retval < 0)
    goto fail_idr;
    + user_key = retval;

    list_add(&item->owner_list, &file_priv->obj_list);
    mutex_unlock(&dev->struct_mutex);
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-07 00:22    [W:4.067 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site