From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754439AbbIPRvp (ORCPT ); Wed, 16 Sep 2015 13:51:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:51433 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754316AbbIPRvW (ORCPT ); Wed, 16 Sep 2015 13:51:22 -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 Subject: [PATCH 16/17] Update the Micron PCIe SSD driver to use ida helper functions. Date: Wed, 16 Sep 2015 10:50:34 -0700 Message-Id: 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/block/mtip32xx/mtip32xx.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 4a2ef09e6704..ccff4119b554 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -3821,15 +3821,7 @@ static int mtip_block_initialize(struct driver_data *dd) } /* Generate the disk name, implemented same as in sd.c */ - do { - if (!ida_pre_get(&rssd_index_ida, GFP_KERNEL)) - goto ida_get_error; - - spin_lock(&rssd_index_lock); - rv = ida_get_new(&rssd_index_ida, &index); - spin_unlock(&rssd_index_lock); - } while (rv == -EAGAIN); - + rv = ida_get_index(&rssd_index_ida, &rssd_index_lock, &index); if (rv) goto ida_get_error; @@ -3981,9 +3973,7 @@ init_hw_cmds_error: block_queue_alloc_init_error: mtip_hw_debugfs_exit(dd); disk_index_error: - spin_lock(&rssd_index_lock); - ida_remove(&rssd_index_ida, index); - spin_unlock(&rssd_index_lock); + ida_put_index(&rssd_index_ida, &rssd_index_lock, index); ida_get_error: put_disk(dd->disk); @@ -4051,9 +4041,7 @@ static int mtip_block_remove(struct driver_data *dd) } dd->disk = NULL; - spin_lock(&rssd_index_lock); - ida_remove(&rssd_index_ida, dd->index); - spin_unlock(&rssd_index_lock); + ida_put_index(&rssd_index_ida, &rssd_index_lock, dd->index); /* De-initialize the protocol layer. */ mtip_hw_exit(dd); @@ -4092,9 +4080,7 @@ static int mtip_block_shutdown(struct driver_data *dd) dd->queue = NULL; } - spin_lock(&rssd_index_lock); - ida_remove(&rssd_index_ida, dd->index); - spin_unlock(&rssd_index_lock); + ida_put_index(&rssd_index_ida, &rssd_index_lock, dd->index); return 0; } -- 2.1.4