3 files changed, 4 insertions, 13 deletions

diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index 52e2da7b3cd7..199e29a044cd 100644
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -396,7 +396,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
 
         pm_runtime_enable(dev);
         ret = pm_runtime_get_sync(dev);
-        if (IS_ERR_VALUE(ret)) {
+        if (ret < 0) {
                 dev_err(dev, "pm_runtime_get_sync failed\n");
                 goto err_get_sync;
         }
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 233a196c6e66..8f3a9813c4e5 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -117,11 +117,7 @@ static int pcie_phy_wait_ack(void __iomem *dbi_base, int addr)
         val = addr << PCIE_PHY_CTRL_DATA_LOC;
         writel(val, dbi_base + PCIE_PHY_CTRL);
 
-        ret = pcie_phy_poll_ack(dbi_base, 0);
-        if (ret)
-                return ret;
-
-        return 0;
+        return pcie_phy_poll_ack(dbi_base, 0);
 }
 
 /* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */
@@ -148,11 +144,7 @@ static int pcie_phy_read(void __iomem *dbi_base, int addr , int *data)
         /* deassert Read signal */
         writel(0x00, dbi_base + PCIE_PHY_CTRL);
 
-        ret = pcie_phy_poll_ack(dbi_base, 0);
-        if (ret)
-                return ret;
-
-        return 0;
+        return pcie_phy_poll_ack(dbi_base, 0);
 }
 
 static int pcie_phy_write(void __iomem *dbi_base, int addr, int data)
diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c
index c49fbdc0f6e4..98d2683181bc 100644
--- a/drivers/pci/host/pcie-spear13xx.c
+++ b/drivers/pci/host/pcie-spear13xx.c
@@ -223,8 +223,7 @@ static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg)
         status = readl(&app_reg->int_sts);
 
         if (status & MSI_CTRL_INT) {
-                if (!IS_ENABLED(CONFIG_PCI_MSI))
-                        BUG();
+                BUG_ON(!IS_ENABLED(CONFIG_PCI_MSI));
                 dw_handle_msi_irq(pp);
         }