Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus

3 files changed, 7 insertions, 13 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a896d948b79e..187f83629f7e 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1400,7 +1400,6 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
  *      @vendor: pci vendor id
  *      @device: pci device id
  *      @revision: pci revision id
- *      @prod_name: string returned
  *
  *      Returns product string displayed when driver loads,
  *      in /proc/mpt/summary and /sysfs/class/scsi_host/host<X>/version_product
@@ -3172,12 +3171,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                         facts->FWImageSize = le32_to_cpu(facts->FWImageSize);
                 }
 
-                sz = facts->FWImageSize;
-                if ( sz & 0x01 )
-                        sz += 1;
-                if ( sz & 0x02 )
-                        sz += 2;
-                facts->FWImageSize = sz;
+                facts->FWImageSize = ALIGN(facts->FWImageSize, 4);
 
                 if (!facts->RequestFrameSize) {
                         /*  Something is wrong!  */
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index b0a892a2bf1b..70bb7530b22c 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1741,12 +1741,7 @@ mptctl_replace_fw (unsigned long arg)
 
         /* Allocate memory for the new FW image
          */
-        newFwSize = karg.newImageSize;
-
-        if (newFwSize & 0x01)
-                newFwSize += 1;
-        if (newFwSize & 0x02)
-                newFwSize += 2;
+        newFwSize = ALIGN(karg.newImageSize, 4);
 
         mpt_alloc_fw_memory(ioc, newFwSize);
         if (ioc->cached_fw == NULL)
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 787933d43d32..613231c16194 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1419,6 +1419,11 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_mptspi_probe;
         }
 
+        /* VMWare emulation doesn't properly implement WRITE_SAME
+         */
+        if (pdev->subsystem_vendor == 0x15AD)
+                sh->no_write_same = 1;
+
         spin_lock_irqsave(&ioc->FreeQlock, flags);
 
         /* Attach the SCSI Host to the IOC structure