mmc_block: Allow more than 8 partitions per card

Set the GENHD_FL_EXT_DEVT flag, which will allocate minor numbers
in major 259 for partitions past disk->minors.

Also remove the use of disk_devt to determine devidx from md->disk.
md->disk->first_minor is always initialized from devidx and can
always be used to recover it.

Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 8a5dd72d47bd5ebc3a6dab31357ab0f9fd90a2d0..7054fd5863a08d47cb9b509151f5ea02cf148deb 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -87,11 +87,7 @@ static void mmc_blk_put(struct mmc_blk_data *md)
        mutex_lock(&open_lock);
        md->usage--;
        if (md->usage == 0) {
-               int devmaj = MAJOR(disk_devt(md->disk));
-               int devidx = MINOR(disk_devt(md->disk)) >> MMC_SHIFT;
-
-               if (!devmaj)
-                       devidx = md->disk->first_minor >> MMC_SHIFT;
+               int devidx = md->disk->first_minor >> MMC_SHIFT;
 
                blk_cleanup_queue(md->queue.queue);
 
@@ -622,6 +618,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
        md->disk->private_data = md;
        md->disk->queue = md->queue.queue;
        md->disk->driverfs_dev = &card->dev;
+       md->disk->flags = GENHD_FL_EXT_DEVT;
 
        /*
         * As discussed on lkml, GENHD_FL_REMOVABLE should: