From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754586AbbIPRxG (ORCPT ); Wed, 16 Sep 2015 13:53:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:51443 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754293AbbIPRvU (ORCPT ); Wed, 16 Sep 2015 13:51:20 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Lee Duncan 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 , Alex Dubov Subject: [PATCH 12/17] Update the TI Flash Media driver to use idr helper functions. Date: Wed, 16 Sep 2015 10:50:30 -0700 Message-Id: <1660d98f948e952cc62793619c45f764912e87ab.1442263513.git.lduncan@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Lee Duncan --- drivers/misc/tifm_core.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c index a511b2a713b3..46385f828a8f 100644 --- a/drivers/misc/tifm_core.c +++ b/drivers/misc/tifm_core.c @@ -198,22 +198,15 @@ int tifm_add_adapter(struct tifm_adapter *fm) { int rc; - idr_preload(GFP_KERNEL); - spin_lock(&tifm_adapter_lock); - rc = idr_alloc(&tifm_adapter_idr, fm, 0, 0, GFP_NOWAIT); - if (rc >= 0) - fm->id = rc; - spin_unlock(&tifm_adapter_lock); - idr_preload_end(); + rc = idr_get_index(&tifm_adapter_idr, &tifm_adapter_lock, fm); if (rc < 0) return rc; + fm->id = rc; dev_set_name(&fm->dev, "tifm%u", fm->id); rc = device_add(&fm->dev); if (rc) { - spin_lock(&tifm_adapter_lock); - idr_remove(&tifm_adapter_idr, fm->id); - spin_unlock(&tifm_adapter_lock); + idr_put_index(&tifm_adapter_idr, &tifm_adapter_lock, fm->id); } return rc; @@ -230,9 +223,7 @@ void tifm_remove_adapter(struct tifm_adapter *fm) device_unregister(&fm->sockets[cnt]->dev); } - spin_lock(&tifm_adapter_lock); - idr_remove(&tifm_adapter_idr, fm->id); - spin_unlock(&tifm_adapter_lock); + idr_put_index(&tifm_adapter_idr, &tifm_adapter_lock, fm->id); device_del(&fm->dev); } EXPORT_SYMBOL(tifm_remove_adapter); -- 2.1.4