From patchwork Sun Sep 6 17:59:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Duncan X-Patchwork-Id: 7132351 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 585889F380 for ; Sun, 6 Sep 2015 17:59:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35013206CC for ; Sun, 6 Sep 2015 17:59:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40C22206D0 for ; Sun, 6 Sep 2015 17:59:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753244AbbIFR7r (ORCPT ); Sun, 6 Sep 2015 13:59:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:46813 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753233AbbIFR7p (ORCPT ); Sun, 6 Sep 2015 13:59:45 -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 7F514AD6A; Sun, 6 Sep 2015 17:59:43 +0000 (UTC) Received: by worklaptop.gonzoleeman.net (Postfix, from userid 1000) id E197040C75; Sun, 6 Sep 2015 10:59:36 -0700 (PDT) From: Lee Duncan To: linux-scsi Cc: Christoph Hellwig , hare@suse.com, jthumshirn@suse.de, JBottomley@Parallels.com, Lee Duncan Subject: [PATCH 3/6] Update soc driver to use new ida helper functions Date: Sun, 6 Sep 2015 10:59:31 -0700 Message-Id: <145dc6d9918fe55a50afd10e22b336a041e8f692.1441416572.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=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This simplifies the calling sequence to acquire and to release an ida-managed index. Note that the ida_destroy() calls here previously had no locking, so this may close a race condition when errors occur or when removing a soc. Signed-off-by: Lee Duncan --- drivers/base/soc.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/base/soc.c b/drivers/base/soc.c index 39fca01c8fa1..7b632f086524 100644 --- a/drivers/base/soc.c +++ b/drivers/base/soc.c @@ -122,18 +122,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr } /* Fetch a unique (reclaimable) SOC ID. */ - do { - if (!ida_pre_get(&soc_ida, GFP_KERNEL)) { - ret = -ENOMEM; - goto out2; - } - - spin_lock(&soc_lock); - ret = ida_get_new(&soc_ida, &soc_dev->soc_dev_num); - spin_unlock(&soc_lock); - - } while (ret == -EAGAIN); - + ret = ida_get_index(&soc_ida, &soc_lock, &soc_dev->soc_dev_num); if (ret) goto out2; @@ -151,7 +140,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr return soc_dev; out3: - ida_remove(&soc_ida, soc_dev->soc_dev_num); + ida_put_index(&soc_ida, &sock_lock, soc_dev->soc_dev_num); out2: kfree(soc_dev); out1: @@ -161,7 +150,7 @@ out1: /* Ensure soc_dev->attr is freed prior to calling soc_device_unregister. */ void soc_device_unregister(struct soc_device *soc_dev) { - ida_remove(&soc_ida, soc_dev->soc_dev_num); + ida_put_index(&soc_ida, &sock_lock, soc_dev->soc_dev_num); device_unregister(&soc_dev->dev); }