disable some mediatekl custom warnings

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / storvsc_drv.c

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 5dd6c49bfa7e6067d7773b752b20c9a439ab5414..91b76cea3e3cb94f9bea8229379d96fbcbfeb2c1 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1189,6 +1189,9 @@ static void storvsc_device_destroy(struct scsi_device *sdevice)
 {
        struct stor_mem_pools *memp = sdevice->hostdata;
 
+       if (!memp)
+               return;
+
        mempool_destroy(memp->request_mempool);
        kmem_cache_destroy(memp->request_pool);
        kfree(memp);
@@ -1454,6 +1457,7 @@ static struct scsi_host_template scsi_driver = {
        .use_clustering =       DISABLE_CLUSTERING,
        /* Make sure we dont get a sg segment crosses a page boundary */
        .dma_boundary =         PAGE_SIZE-1,
+       .no_write_same =        1,
 };
 
 enum {
@@ -1463,13 +1467,13 @@ enum {
 
 static const struct hv_vmbus_device_id id_table[] = {
        /* SCSI guid */
-       { VMBUS_DEVICE(0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
-                      0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f)
-         .driver_data = SCSI_GUID },
+       { HV_SCSI_GUID,
+         .driver_data = SCSI_GUID
+       },
        /* IDE guid */
-       { VMBUS_DEVICE(0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
-                      0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5)
-         .driver_data = IDE_GUID },
+       { HV_IDE_GUID,
+         .driver_data = IDE_GUID
+       },
        { },
 };