Lee Duncan <lduncan@xxxxxxxx> writes:
> Simplify ida index allocation and removal by
> using the ida_simple_* helper functions.
>
> Signed-off-by: Lee Duncan <lduncan@xxxxxxxx>
> ---
> drivers/block/rsxx/core.c | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
> index d8b2488aaade..d2279a759b2e 100644
> --- a/drivers/block/rsxx/core.c
> +++ b/drivers/block/rsxx/core.c
> @@ -58,7 +58,6 @@ MODULE_PARM_DESC(sync_start, "On by Default: Driver load will not complete "
> "until the card startup has completed.");
>
> static DEFINE_IDA(rsxx_disk_ida);
> -static DEFINE_SPINLOCK(rsxx_ida_lock);
>
> /* --------------------Debugfs Setup ------------------- */
>
> @@ -774,19 +773,10 @@ 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);
> -
> - if (st)
> + st = ida_simple_get(&rsxx_disk_ida, 0, 0, GFP_KERNEL);
> + if (st < 0)
> goto failed_ida_get;
> + card->disk_id = st;
>
> st = pci_enable_device(dev);
> if (st)
> @@ -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_simple_remove(&rsxx_disk_ida, card->disk_id);
> failed_ida_get:
> kfree(card);
Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
--
Johannes Thumshirn Storage
jthumshirn@xxxxxxx +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
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
