memstick: convert to idr_alloc()

[~andy/linux] / drivers / memstick / core / mspro_block.c

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 9729b92fbfdd3150280328a2be3d5872beacd618..f12b78dbce0426ba28fb156f1cf48c412fa75196 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1213,21 +1213,10 @@ static int mspro_block_init_disk(struct memstick_dev *card)
        msb->page_size = be16_to_cpu(sys_info->unit_size);
 
        mutex_lock(&mspro_block_disk_lock);
-       if (!idr_pre_get(&mspro_block_disk_idr, GFP_KERNEL)) {
-               mutex_unlock(&mspro_block_disk_lock);
-               return -ENOMEM;
-       }
-
-       rc = idr_get_new(&mspro_block_disk_idr, card, &disk_id);
+       disk_id = idr_alloc(&mspro_block_disk_idr, card, 0, 256, GFP_KERNEL);
        mutex_unlock(&mspro_block_disk_lock);
-
-       if (rc)
-               return rc;
-
-       if ((disk_id << MSPRO_BLOCK_PART_SHIFT) > 255) {
-               rc = -ENOSPC;
-               goto out_release_id;
-       }
+       if (disk_id < 0)
+               return disk_id;
 
        msb->disk = alloc_disk(1 << MSPRO_BLOCK_PART_SHIFT);
        if (!msb->disk) {