From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753114AbbIOQtq (ORCPT ); Tue, 15 Sep 2015 12:49:46 -0400 Received: from mx2.suse.de ([195.135.220.15]:52888 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753098AbbIOQrv (ORCPT ); Tue, 15 Sep 2015 12:47:51 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Lee Duncan To: , Cc: Hannes Reinecke , Johannes Thumshirn , Christoph Hellwig , Lee Duncan , Joshua Morris Subject: [PATCH 14/17] Update the rsxx flash adapter driver to use ida helper functions. Date: Tue, 15 Sep 2015 09:46:14 -0700 Message-Id: <049a0c72418d1e2854d315bf8b583a562dbd9264.1442263512.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/block/rsxx/core.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c index d8b2488aaade..dd23a0e85040 100644 --- a/drivers/block/rsxx/core.c +++ b/drivers/block/rsxx/core.c @@ -774,17 +774,7 @@ static int rsxx_pci_probe(struct pci_dev *dev, card->dev = dev; pci_set_drvdata(dev, card); - do { - if (!ida_pre_get(&rsxx_disk_ida, GFP_KERNEL)) { - st = -ENOMEM; - goto failed_ida_get; - } - - spin_lock(&rsxx_ida_lock); - st = ida_get_new(&rsxx_disk_ida, &card->disk_id); - spin_unlock(&rsxx_ida_lock); - } while (st == -EAGAIN); - + st = ida_get_index(&rsxx_disk_ida, &rsxx_ida_lock, &card->disk_id); if (st) goto failed_ida_get; @@ -987,9 +977,7 @@ failed_request_regions: failed_dma_mask: pci_disable_device(dev); failed_enable: - spin_lock(&rsxx_ida_lock); - ida_remove(&rsxx_disk_ida, card->disk_id); - spin_unlock(&rsxx_ida_lock); + ida_put_index(&rsxx_disk_ida, &rsxx_ida_lock, card->disk_id); failed_ida_get: kfree(card); -- 2.1.4