From patchwork Tue Sep 15 16:46:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Duncan X-Patchwork-Id: 7188101 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 888BA9F32B for ; Tue, 15 Sep 2015 16:48:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6BC42072F for ; Tue, 15 Sep 2015 16:48:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D25B42072B for ; Tue, 15 Sep 2015 16:48:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752885AbbIOQsX (ORCPT ); Tue, 15 Sep 2015 12:48:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:52896 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752559AbbIOQrz (ORCPT ); Tue, 15 Sep 2015 12:47:55 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C7DB1AD91; Tue, 15 Sep 2015 16:47:53 +0000 (UTC) Received: by worklaptop.gonzoleeman.net (Postfix, from userid 1000) id 8330440C86; Tue, 15 Sep 2015 09:47:37 -0700 (PDT) From: Lee Duncan To: , Cc: Hannes Reinecke , Johannes Thumshirn , Christoph Hellwig , Lee Duncan , Matthew Wilcox Subject: [PATCH 15/17] Update the NVMe SSD driver to use ida helper functions. Date: Tue, 15 Sep 2015 09:46:15 -0700 Message-Id: <7aa6d6793c6771b69a9cf093e80937669f5fcb4e.1442263512.git.lduncan@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Lee Duncan --- drivers/block/nvme-core.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index d1d6141920d3..ab13833d4fde 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2715,15 +2715,7 @@ static int nvme_set_instance(struct nvme_dev *dev) { int instance, error; - do { - if (!ida_pre_get(&nvme_instance_ida, GFP_KERNEL)) - return -ENODEV; - - spin_lock(&dev_list_lock); - error = ida_get_new(&nvme_instance_ida, &instance); - spin_unlock(&dev_list_lock); - } while (error == -EAGAIN); - + error = ida_get_index(&nvme_instance_ida, &dev_list_lock, &instance); if (error) return -ENODEV; @@ -2733,9 +2725,7 @@ static int nvme_set_instance(struct nvme_dev *dev) static void nvme_release_instance(struct nvme_dev *dev) { - spin_lock(&dev_list_lock); - ida_remove(&nvme_instance_ida, dev->instance); - spin_unlock(&dev_list_lock); + ida_put_index(&nvme_instance_ida, &dev_list_lock, dev->instance); } static void nvme_free_namespaces(struct nvme_dev *dev)