The Hyper-V block driver does not handle removable media.
Get rid of the code to manage removable media.

Signed-off-by: K. Y. Srinivasan <k...@microsoft.com>
Signed-off-by: Haiyang Zhang <haiya...@microsoft.com>
Signed-off-by: Hank Janssen <hjans...@microsoft.com>
---
 drivers/staging/hv/blkvsc_drv.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index c0a7acd..03aebfc 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -436,8 +436,6 @@ static int blkvsc_do_operation(struct block_device_context 
*blkdev,
 
                if (device_type == 0x0)
                        blkdev->device_type = HARDDISK_TYPE;
-                else if (device_type == 0x5)
-                       blkdev->device_type = DVD_TYPE;
                 else
                        blkdev->device_type = UNKNOWN_DEV_TYPE;
 
@@ -1074,12 +1072,7 @@ static int blkvsc_probe(struct device *device)
        sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum);
 
        blkvsc_do_operation(blkdev, DO_INQUIRY);
-       if (blkdev->device_type == DVD_TYPE) {
-               set_disk_ro(blkdev->gd, 1);
-               blkdev->gd->flags |= GENHD_FL_REMOVABLE;
-               blkvsc_do_operation(blkdev, DO_CAPACITY);
-       } else
-               blkvsc_do_operation(blkdev, DO_CAPACITY);
+       blkvsc_do_operation(blkdev, DO_CAPACITY);
 
        set_capacity(blkdev->gd, blkdev->capacity * (blkdev->sector_size/512));
        blk_queue_logical_block_size(blkdev->gd->queue, blkdev->sector_size);
-- 
1.7.4.1

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to