IB/qib: convert to idr_alloc() (80f22b44) · Commits · 戴 / test

drivers/infiniband/hw/qib/qib_init.c

+8 −13

Original line number	Diff line number	Diff line
		@@ -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();