[PATCH 01/11] Revert "UBUNTU: SAUCE: scsi: hyper-v storsvc switch up to SPC-3"

[Andy Whitcroft]

This reverts commit 1cbbe45e891a262e95f7d0c44c23e6d4f85e936e.

BugLink: http://bugs.launchpad.net/bugs/1354397
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 drivers/scsi/storvsc_drv.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 3903c8a..9969fa1 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1441,14 +1441,6 @@ static int storvsc_device_configure(struct scsi_device *sdevice)
 
 	sdevice->no_write_same = 1;
 
-	/*
-	 * hyper-v lies about its capabilities indicating it is only SPC-2
-	 * compliant, but actually implements the core SPC-3 features.
-	 * If we pretend to be SPC-3, we send RC16 which activates trim and
-	 * will query the appropriate VPD pages to enable trim.
-	 */
-	sdevice->scsi_level = SCSI_SPC_3;
-
 	return 0;
 }
 
-- 
1.9.1