Revert "mtd_blkdevs: don't scan partitions for plain mtdblock"
authorJens Axboe <axboe@kernel.dk>
Fri, 10 Dec 2021 18:52:34 +0000 (11:52 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 10 Dec 2021 18:52:34 +0000 (11:52 -0700)
This reverts commit 776b54e97a7d993ba23696e032426d5dea5bbe70.

Looks like a last minute edit snuck into this patch, and as a result,
it doesn't even compile. Revert the change for now.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/mtd/mtd_blkdevs.c

index a69d064a8eec9bd038c9e442190567cc807c16c1..4eaba6f4ec680aad6cfa6ea011b6bd87aa459d83 100644 (file)
@@ -346,7 +346,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        gd->minors = 1 << tr->part_bits;
        gd->fops = &mtd_block_ops;
 
-       if (tr->part_bits) {
+       if (tr->part_bits)
                if (new->devnum < 26)
                        snprintf(gd->disk_name, sizeof(gd->disk_name),
                                 "%s%c", tr->name, 'a' + new->devnum);
@@ -355,11 +355,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
                                 "%s%c%c", tr->name,
                                 'a' - 1 + new->devnum / 26,
                                 'a' + new->devnum % 26);
-       } else {
+       else
                snprintf(gd->disk_name, sizeof(gd->disk_name),
                         "%s%d", tr->name, new->devnum);
-               gd->flags |= GENHD_FL_NO_PART;
-       }
 
        set_capacity(gd, ((u64)new->size * tr->blksize) >> 9);