Skip to content

Commit

Permalink
Staging: hv: Get rid of the code to manage removable media
Browse files Browse the repository at this point in the history
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 <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 25, 2011
1 parent 1c8d0b7 commit d491982
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,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;

Expand Down Expand Up @@ -1076,12 +1074,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);
Expand Down

0 comments on commit d491982

Please sign in to comment.