From: Johannes Thumshirn <jthumshirn@suse.de>
To: Lee Duncan <lduncan@suse.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tejun Heo <tj@kernel.org>, Hannes Reinecke <hare@suse.com>,
Christoph Hellwig <hch@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH 5/5] base: soc: siplify ida usage
Date: Fri, 02 Oct 2015 12:16:19 +0200 [thread overview]
Message-ID: <mqdfv1t7ez0.fsf@c203.arch.suse.de> (raw)
In-Reply-To: <bdf9231610686622d6a422e3c9dd8a615535afeb.1443723136.git.lduncan@suse.com> (Lee Duncan's message of "Thu, 1 Oct 2015 11:59:09 -0700")
Lee Duncan <lduncan@suse.com> writes:
> Simplify ida index allocation and removal by
> using the ida_simple_* helper functions
>
> Signed-off-by: Lee Duncan <lduncan@suse.com>
> ---
> drivers/base/soc.c | 21 +++++----------------
> 1 file changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/base/soc.c b/drivers/base/soc.c
> index 39fca01c8fa1..75b98aad6faf 100644
> --- a/drivers/base/soc.c
> +++ b/drivers/base/soc.c
> @@ -16,7 +16,6 @@
> #include <linux/err.h>
>
> static DEFINE_IDA(soc_ida);
> -static DEFINE_SPINLOCK(soc_lock);
>
> static ssize_t soc_info_get(struct device *dev,
> struct device_attribute *attr,
> @@ -122,20 +121,10 @@ 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);
> -
> - if (ret)
> + ret = ida_simple_get(&soc_ida, 0, 0, GFP_KERNEL);
> + if (ret < 0)
> goto out2;
> + soc_dev->soc_dev_num = ret;
>
> soc_dev->attr = soc_dev_attr;
> soc_dev->dev.bus = &soc_bus_type;
> @@ -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_simple_remove(&soc_ida, 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_simple_remove(&soc_ida, soc_dev->soc_dev_num);
>
> device_unregister(&soc_dev->dev);
> }
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
next prev parent reply other threads:[~2015-10-02 10:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 18:59 [PATCH 0/5] Modify ida_* users to use ida_simple_* Lee Duncan
2015-10-01 18:59 ` [PATCH 1/5] SCSI: sd: simplify ida usage Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 2/5] block: rsxx: core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 3/5] block: nvme-core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-08 14:29 ` Keith Busch
2015-10-01 18:59 ` [PATCH 4/5] block: mtip32xx: " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 5/5] base: soc: siplify " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn [this message]
2015-10-05 17:44 ` [PATCH 0/5] Modify ida_* users to use ida_simple_* Tejun Heo
2015-10-05 17:52 ` James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mqdfv1t7ez0.fsf@c203.arch.suse.de \
--to=jthumshirn@suse.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=lduncan@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).