2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ea3aafbbda44..d0d126c69354 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1534,13 +1534,13 @@ mpt_mapresources(MPT_ADAPTER *ioc)
 
         pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
-            && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))
+            && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
                     ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
                     ioc->name));
-        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)
-            && !pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))
+            && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
                     ": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
                     ioc->name));
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 12b732512e57..a9019f081b97 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -2279,9 +2279,8 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)
         mutex_lock(&ioc->sas_topology_mutex);
         list_for_each_entry_safe(port_info, n, &ioc->sas_topology, list) {
 
-                if (port_info->phy_info &&
-                    (!(port_info->phy_info[0].identify.device_info &
-                    MPI_SAS_DEVICE_INFO_SMP_TARGET)))
+                if (!(port_info->phy_info[0].identify.device_info &
+                    MPI_SAS_DEVICE_INFO_SMP_TARGET))
                         continue;
 
                 if (mptsas_sas_expander_pg0(ioc, &buffer,