mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-27 20:07:09 +00:00
memstick: convert to idr_alloc()
Convert to the much saner new idr interface. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Alex Dubov <oakad@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c9d76be696
commit
7b51f47835
drivers/memstick/core
@ -512,18 +512,17 @@ int memstick_add_host(struct memstick_host *host)
|
||||
{
|
||||
int rc;
|
||||
|
||||
while (1) {
|
||||
if (!idr_pre_get(&memstick_host_idr, GFP_KERNEL))
|
||||
return -ENOMEM;
|
||||
idr_preload(GFP_KERNEL);
|
||||
spin_lock(&memstick_host_lock);
|
||||
|
||||
spin_lock(&memstick_host_lock);
|
||||
rc = idr_get_new(&memstick_host_idr, host, &host->id);
|
||||
spin_unlock(&memstick_host_lock);
|
||||
if (!rc)
|
||||
break;
|
||||
else if (rc != -EAGAIN)
|
||||
return rc;
|
||||
}
|
||||
rc = idr_alloc(&memstick_host_idr, host, 0, 0, GFP_NOWAIT);
|
||||
if (rc >= 0)
|
||||
host->id = rc;
|
||||
|
||||
spin_unlock(&memstick_host_lock);
|
||||
idr_preload_end();
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
dev_set_name(&host->dev, "memstick%u", host->id);
|
||||
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user