From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754664AbbIPRyk (ORCPT ); Wed, 16 Sep 2015 13:54:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:51424 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754171AbbIPRvS (ORCPT ); Wed, 16 Sep 2015 13:51:18 -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 , Ulf Hansson Subject: [PATCH 08/17] Update the mmc driver to use idr helper functions. Date: Wed, 16 Sep 2015 10:50:26 -0700 Message-Id: <5e015e43f03ba302ded85e71db48a8ed6fdc1ac6.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/mmc/core/host.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 99a9c9011c50..5aa2330f074c 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -40,9 +40,8 @@ static DEFINE_SPINLOCK(mmc_host_lock); static void mmc_host_classdev_release(struct device *dev) { struct mmc_host *host = cls_dev_to_mmc_host(dev); - spin_lock(&mmc_host_lock); - idr_remove(&mmc_host_idr, host->index); - spin_unlock(&mmc_host_lock); + + idr_put_index(&mmc_host_idr, &mmc_host_lock, host->index); kfree(host); } @@ -559,17 +558,12 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) /* scanning will be enabled when we're ready */ host->rescan_disable = 1; - idr_preload(GFP_KERNEL); - spin_lock(&mmc_host_lock); - err = idr_alloc(&mmc_host_idr, host, 0, 0, GFP_NOWAIT); - if (err >= 0) - host->index = err; - spin_unlock(&mmc_host_lock); - idr_preload_end(); + err = idr_get_index(&mmc_host_idr, &mmc_host_lock, host); if (err < 0) { kfree(host); return NULL; } + host->index = err; dev_set_name(&host->class_dev, "mmc%d", host->index); -- 2.1.4