mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Duncan <lduncan@suse.com>
To: linux-scsi@vger.kernel.org, James.Bottomley@HansenPartnership.com
Cc: linux-kernel@vger.kernel.org, hare@suse.com, jthumshirn@suse.de,
	hch@infradead.org, Lee Duncan <lduncan@suse.com>
Subject: [PATCH 10/17] Update the DCA DMA driver to use idr helper functions.
Date: Wed, 16 Sep 2015 10:50:28 -0700	[thread overview]
Message-ID: <77238f931cd168e25f836e0d0fdf0eeab4eb9056.1442263513.git.lduncan@suse.com> (raw)
In-Reply-To: <cover.1442263513.git.lduncan@suse.com>
In-Reply-To: <cover.1442263513.git.lduncan@suse.com>

Signed-off-by: Lee Duncan <lduncan@suse.com>
---
 drivers/dca/dca-sysfs.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c
index 126cf295b198..8930707df295 100644
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
@@ -55,23 +55,14 @@ int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev)
 	struct device *cd;
 	int ret;
 
-	idr_preload(GFP_KERNEL);
-	spin_lock(&dca_idr_lock);
-
-	ret = idr_alloc(&dca_idr, dca, 0, 0, GFP_NOWAIT);
-	if (ret >= 0)
-		dca->id = ret;
-
-	spin_unlock(&dca_idr_lock);
-	idr_preload_end();
+	ret = idr_get_index(&dca_idr, &dca_idr_lock, dca);
 	if (ret < 0)
 		return ret;
+	dca->id = ret;
 
 	cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id);
 	if (IS_ERR(cd)) {
-		spin_lock(&dca_idr_lock);
-		idr_remove(&dca_idr, dca->id);
-		spin_unlock(&dca_idr_lock);
+		idr_put_index(&dca_idr, &dca_idr_lock, dca->id);
 		return PTR_ERR(cd);
 	}
 	dca->cd = cd;
@@ -82,9 +73,7 @@ void dca_sysfs_remove_provider(struct dca_provider *dca)
 {
 	device_unregister(dca->cd);
 	dca->cd = NULL;
-	spin_lock(&dca_idr_lock);
-	idr_remove(&dca_idr, dca->id);
-	spin_unlock(&dca_idr_lock);
+	idr_put_index(&dca_idr, &dca_idr_lock, dca->id);
 }
 
 int __init dca_sysfs_init(void)
-- 
2.1.4


  parent reply	other threads:[~2015-09-16 17:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-16 17:50 [PATCH 00/17] Create and use ida and idr helper routines [RESEND] Lee Duncan
2015-09-16 17:50 ` [PATCH 01/17] Add ida and idr helper routines Lee Duncan
2015-09-16 17:50 ` [PATCH 02/17] Update scsi hosts to use idr for host number mgmt Lee Duncan
2015-09-16 17:50 ` [PATCH 03/17] Update the st driver to use idr helper functions Lee Duncan
2015-09-16 17:50 ` [PATCH 04/17] Update the ch " Lee Duncan
2015-09-16 17:50 ` [PATCH 05/17] Update the md " Lee Duncan
2015-09-16 17:50 ` [PATCH 06/17] Update the infiniband uverbs " Lee Duncan
2015-09-16 18:39   ` Doug Ledford
2015-09-16 17:50 ` [PATCH 07/17] Update the memstick " Lee Duncan
2015-09-16 17:50 ` [PATCH 08/17] Update the mmc " Lee Duncan
2015-09-16 17:50 ` [PATCH 09/17] Update the virtgpu " Lee Duncan
2015-09-16 17:50 ` Lee Duncan [this message]
2015-09-16 17:50 ` [PATCH 11/17] Update the rtsx multifunction " Lee Duncan
2015-09-16 17:50 ` [PATCH 12/17] Update the TI Flash Media " Lee Duncan
2015-09-16 17:50 ` [PATCH 13/17] Update the SCSI disk driver to use ida " Lee Duncan
2015-09-16 17:50 ` [PATCH 14/17] Update the rsxx flash adapter " Lee Duncan
2015-09-16 17:50 ` [PATCH 15/17] Update the NVMe SSD " Lee Duncan
2015-09-16 17:50 ` [PATCH 16/17] Update the Micron PCIe " Lee Duncan
2015-09-16 17:50 ` [PATCH 17/17] Update the ARM soc base " Lee Duncan
  -- strict thread matches above, loose matches on Subject: below --
2015-09-15 16:46 [PATCH 00/17] Create and use ida and idr helper routines Lee Duncan
2015-09-15 16:46 ` [PATCH 10/17] Update the DCA DMA driver to use idr helper functions Lee Duncan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=77238f931cd168e25f836e0d0fdf0eeab4eb9056.1442263513.git.lduncan@suse.com \
    --to=lduncan@suse.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=hare@suse.com \
    --cc=hch@infradead.org \
    --cc=jthumshirn@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®