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 33/62] mfd: 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: Samuel Ortiz <sameo@linux.intel.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/mfd/rtsx_pcr.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
    index 7a7b0bd..76172d8 100644
    --- a/drivers/mfd/rtsx_pcr.c
    +++ b/drivers/mfd/rtsx_pcr.c
    @@ -1032,15 +1032,14 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
    }
    handle->pcr = pcr;

    - if (!idr_pre_get(&rtsx_pci_idr, GFP_KERNEL)) {
    - ret = -ENOMEM;
    - goto free_handle;
    - }
    -
    + idr_preload(GFP_KERNEL);
    spin_lock(&rtsx_pci_lock);
    - ret = idr_get_new(&rtsx_pci_idr, pcr, &pcr->id);
    + ret = idr_alloc(&rtsx_pci_idr, pcr, 0, 0, GFP_NOWAIT);
    + if (ret >= 0)
    + pcr->id = ret;
    spin_unlock(&rtsx_pci_lock);
    - if (ret)
    + idr_preload_end();
    + if (ret < 0)
    goto free_handle;

    pcr->pci = pcidev;
    --
    1.8.1


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