From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Mon, 8 Jun 2015 06:23:44 +0000 (+0900)
Subject: virtio_blk: removed W/A for sdcard support
X-Git-Tag: submit/tizen/20160422.055611~1^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=691201fdcd1480640cf0a75f05a77e000a0c543a;p=sdk%2Femulator%2Femulator-kernel.git

virtio_blk: removed W/A for sdcard support

A sdcard support will be done by udev rules and deviced.

Change-Id: I126ba1c72e1215ee28ee4da34791877d86b56435
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index f5c9f5460eb4..6c911c86fb5a 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -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);