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 36/62] mmc: 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: Chris Ball <cjb@laptop.org>
    Cc: linux-mmc@vger.kernel.org
    ---
    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/mmc/core/host.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
    index ee2e16b..1117de7 100644
    --- a/drivers/mmc/core/host.c
    +++ b/drivers/mmc/core/host.c
    @@ -306,19 +306,20 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
    int err;
    struct mmc_host *host;

    - if (!idr_pre_get(&mmc_host_idr, GFP_KERNEL))
    - return NULL;
    -
    host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
    if (!host)
    return NULL;

    /* scanning will be enabled when we're ready */
    host->rescan_disable = 1;
    + idr_preload(GFP_KERNEL);
    spin_lock(&mmc_host_lock);
    - err = idr_get_new(&mmc_host_idr, host, &host->index);
    + err = idr_alloc(&mmc_host_idr, host, 0, 0, GFP_NOWAIT);
    + if (err >= 0)
    + host->index = err;
    spin_unlock(&mmc_host_lock);
    - if (err)
    + idr_preload_end();
    + if (err < 0)
    goto free;

    dev_set_name(&host->class_dev, "mmc%d", host->index);
    --
    1.8.1


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