With the previous patch "mmc: block: mmcblkN: use slot index instead of dynamic name index" name_idx is not needed any more.
Signed-off-by: Dirk Behme dirk.behme@de.bosch.com CC: Jassi Brar jaswinder.singh@linaro.org CC: Chris Ball cjb@laptop.org --- drivers/mmc/card/block.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a01d306..555d840 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -74,7 +74,6 @@ static int max_devices;
/* 256 minors, so at most 256 separate devices */ static DECLARE_BITMAP(dev_use, 256); -static DECLARE_BITMAP(name_use, 256);
/* * There is one mmc_blk_data per slot. @@ -92,7 +91,6 @@ struct mmc_blk_data { unsigned int usage; unsigned int read_only; unsigned int part_type; - unsigned int name_idx; unsigned int reset_done; #define MMC_BLK_READ BIT(0) #define MMC_BLK_WRITE BIT(1) @@ -1458,19 +1456,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, goto out; }
- /* - * !subname implies we are creating main mmc_blk_data that will be - * associated with mmc_card with mmc_set_drvdata. Due to device - * partitions, devidx will not coincide with a per-physical card - * index anymore so we keep track of a name index. - */ - if (!subname) { - md->name_idx = find_first_zero_bit(name_use, max_devices); - __set_bit(md->name_idx, name_use); - } else - md->name_idx = ((struct mmc_blk_data *) - dev_to_disk(parent)->private_data)->name_idx; - md->area_type = area_type;
/* @@ -1660,7 +1645,6 @@ static void mmc_blk_remove_parts(struct mmc_card *card, struct list_head *pos, *q; struct mmc_blk_data *part_md;
- __clear_bit(md->name_idx, name_use); list_for_each_safe(pos, q, &md->part) { part_md = list_entry(pos, struct mmc_blk_data, part); list_del(pos);