virtio_blk: removed W/A for sdcard support
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 8 Jun 2015 06:23:44 +0000 (15:23 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 8 Jun 2015 06:26:42 +0000 (15:26 +0900)
A sdcard support will be done by udev rules and deviced.

Change-Id: I126ba1c72e1215ee28ee4da34791877d86b56435
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
drivers/block/virtio_blk.c

index f5c9f5460eb4bdd0f0afbdd64a4b491a4a9047cf..6c911c86fb5a404ad1cd2fb990f3d18f49bbea28 100644 (file)
@@ -566,19 +566,7 @@ static int virtblk_probe(struct virtio_device *vdev)
 
        q->queuedata = vblk;
 
-#ifdef CONFIG_MARU     // for virtio sdcard...
-       // index 0 for root partition
-       // index 1 for swap partition
-       // index over 2 for mmcblk
-       if (index > 1) {
-               snprintf(vblk->disk->disk_name, DISK_NAME_LEN, "mmcblk%d", index - 2);
-       }
-       else {
-               virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN);
-       }
-#else
        virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN);
-#endif
 
        vblk->disk->major = major;
        vblk->disk->first_minor = index_to_minor(index);