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 46/77] IB/qib: 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: Mike Marciniszyn <infinipath@intel.com>
    Cc: linux-rdma@vger.kernel.org
    ---
    drivers/infiniband/hw/qib/qib_init.c | 21 ++++++++-------------
    1 file changed, 8 insertions(+), 13 deletions(-)

    diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
    index ddf066d..50e33aa 100644
    --- a/drivers/infiniband/hw/qib/qib_init.c
    +++ b/drivers/infiniband/hw/qib/qib_init.c
    @@ -1060,22 +1060,23 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra)
    struct qib_devdata *dd;
    int ret;

    - if (!idr_pre_get(&qib_unit_table, GFP_KERNEL)) {
    - dd = ERR_PTR(-ENOMEM);
    - goto bail;
    - }
    -
    dd = (struct qib_devdata *) ib_alloc_device(sizeof(*dd) + extra);
    if (!dd) {
    dd = ERR_PTR(-ENOMEM);
    goto bail;
    }

    + idr_preload(GFP_KERNEL);
    spin_lock_irqsave(&qib_devs_lock, flags);
    - ret = idr_get_new(&qib_unit_table, dd, &dd->unit);
    - if (ret >= 0)
    +
    + ret = idr_alloc(&qib_unit_table, dd, 0, 0, GFP_NOWAIT);
    + if (ret >= 0) {
    + dd->unit = ret;
    list_add(&dd->list, &qib_dev_list);
    + }
    +
    spin_unlock_irqrestore(&qib_devs_lock, flags);
    + idr_preload_end();

    if (ret < 0) {
    qib_early_err(&pdev->dev,
    @@ -1180,11 +1181,6 @@ static int __init qlogic_ib_init(void)
    * the PCI subsystem.
    */
    idr_init(&qib_unit_table);
    - if (!idr_pre_get(&qib_unit_table, GFP_KERNEL)) {
    - pr_err("idr_pre_get() failed\n");
    - ret = -ENOMEM;
    - goto bail_cq_wq;
    - }

    ret = pci_register_driver(&qib_driver);
    if (ret < 0) {
    @@ -1199,7 +1195,6 @@ static int __init qlogic_ib_init(void)

    bail_unit:
    idr_destroy(&qib_unit_table);
    -bail_cq_wq:
    destroy_workqueue(qib_cq_wq);
    bail_dev:
    qib_dev_cleanup();
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-06 23:24    [W:4.161 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site