leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: core: switch to ida_simple_ functions in block.c

Browse Source 
ida code in block.c can be significantly simplified by switching to
the ida_simple_ functions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Heiner Kallweit 2017-02-01 19:44:22 +01:00 committed by Ulf Hansson
parent a53210f56d
commit a04848c75b
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mmc/core/block.c
View File

@ -90,7 +90,6 @@ static int max_devices;
#define MAX_DEVICES 256 #define MAX_DEVICES 256
static DEFINE_IDA(mmc_blk_ida); static DEFINE_IDA(mmc_blk_ida);
static DEFINE_SPINLOCK(mmc_blk_lock);
/* /*
* There is one mmc_blk_data per slot. * There is one mmc_blk_data per slot.
@ -163,11 +162,7 @@ static void mmc_blk_put(struct mmc_blk_data *md)
if (md->usage == 0) { if (md->usage == 0) {
int devidx = mmc_get_devidx(md->disk); int devidx = mmc_get_devidx(md->disk);
blk_cleanup_queue(md->queue.queue); blk_cleanup_queue(md->queue.queue);
ida_simple_remove(&mmc_blk_ida, devidx);
spin_lock(&mmc_blk_lock);
ida_remove(&mmc_blk_ida, devidx);
spin_unlock(&mmc_blk_lock);
put_disk(md->disk); put_disk(md->disk);
kfree(md); kfree(md);
} }
@ -1839,23 +1834,9 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
struct mmc_blk_data *md; struct mmc_blk_data *md;
int devidx, ret; int devidx, ret;
again: devidx = ida_simple_get(&mmc_blk_ida, 0, max_devices, GFP_KERNEL);
if (!ida_pre_get(&mmc_blk_ida, GFP_KERNEL)) if (devidx < 0)
return ERR_PTR(-ENOMEM); return ERR_PTR(devidx);
spin_lock(&mmc_blk_lock);
ret = ida_get_new(&mmc_blk_ida, &devidx);
spin_unlock(&mmc_blk_lock);
if (ret == -EAGAIN)
goto again;
else if (ret)
return ERR_PTR(ret);
if (devidx >= max_devices) {
ret = -ENOSPC;
goto out;
}
md = kzalloc(sizeof(struct mmc_blk_data), GFP_KERNEL); md = kzalloc(sizeof(struct mmc_blk_data), GFP_KERNEL);
if (!md) { if (!md) {
@ -1944,9 +1925,7 @@ again:
err_kfree: err_kfree:
kfree(md); kfree(md);
out: out:
spin_lock(&mmc_blk_lock); ida_simple_remove(&mmc_blk_ida, devidx);
ida_remove(&mmc_blk_ida, devidx);
spin_unlock(&mmc_blk_lock);
return ERR_PTR(ret); return ERR_PTR(ret);
} }