1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 3bdbe50a363f..8a0147dfed27 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -86,7 +86,6 @@ static int max_devices;
 
 /* TODO: Replace these with struct ida */
 static DECLARE_BITMAP(dev_use, MAX_DEVICES);
-static DECLARE_BITMAP(name_use, MAX_DEVICES);
 
 /*
  * There is one mmc_blk_data per slot.
@@ -105,7 +104,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)
@@ -2202,19 +2200,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 dev_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;
 
         /*
@@ -2264,7 +2249,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
          */
 
         snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),
-                 "mmcblk%u%s", md->name_idx, subname ? subname : "");
+                 "mmcblk%u%s", card->host->index, subname ? subname : "");
 
         if (mmc_card_mmc(card))
                 blk_queue_logical_block_size(md->queue.queue,
@@ -2418,7 +2403,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);