Remove unnecessary check for 0. Signed-off-by: "Saheed O. Bolarinwa" <refactormyself@xxxxxxxxx> --- This patch depends on PATCH 07/35 drivers/pci/pci-bridge-emul.c | 2 +- drivers/pci/pci.c | 8 ++++---- drivers/pci/pcie/bw_notification.c | 4 ++-- drivers/pci/probe.c | 4 ++-- drivers/pci/quirks.c | 4 ++-- drivers/pci/syscall.c | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/pci/pci-bridge-emul.c b/drivers/pci/pci-bridge-emul.c index 9695c453e197..c270c18d5cf5 100644 --- a/drivers/pci/pci-bridge-emul.c +++ b/drivers/pci/pci-bridge-emul.c @@ -400,7 +400,7 @@ int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where, return PCIBIOS_BAD_REGISTER_NUMBER; ret = pci_bridge_emul_conf_read(bridge, reg, 4, &old); - if (ret != 0) + if (ret) return ret; if (bridge->has_pcie && reg >= PCI_CAP_PCIE_START) { diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a74547861d5e..4b2a348576cb 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -185,7 +185,7 @@ int pci_status_get_and_clear_errors(struct pci_dev *pdev) int ret; ret = pci_read_config_word(pdev, PCI_STATUS, &status); - if (ret != 0) + if (ret) return -EIO; status &= PCI_STATUS_ERROR_BITS; @@ -534,7 +534,7 @@ int pci_find_next_ext_capability(struct pci_dev *dev, int start, int cap) if (start) pos = start; - if (pci_read_config_dword(dev, pos, &header) != 0) + if (pci_read_config_dword(dev, pos, &header)) return 0; /* @@ -552,7 +552,7 @@ int pci_find_next_ext_capability(struct pci_dev *dev, int start, int cap) if (pos < PCI_CFG_SPACE_SIZE) break; - if (pci_read_config_dword(dev, pos, &header) != 0) + if (pci_read_config_dword(dev, pos, &header)) break; } @@ -628,7 +628,7 @@ static int __pci_find_next_ht_cap(struct pci_dev *dev, int pos, int ht_cap) PCI_CAP_ID_HT, &ttl); while (pos) { rc = pci_read_config_byte(dev, pos + 3, &cap); - if (rc != 0) + if (rc) return 0; if ((cap & mask) == ht_cap) diff --git a/drivers/pci/pcie/bw_notification.c b/drivers/pci/pcie/bw_notification.c index c7201d886026..f62c19ffedfc 100644 --- a/drivers/pci/pcie/bw_notification.c +++ b/drivers/pci/pcie/bw_notification.c @@ -23,7 +23,7 @@ static bool pcie_link_bandwidth_notification_supported(struct pci_dev *dev) u32 lnk_cap; ret = pcie_capability_read_dword(dev, PCI_EXP_LNKCAP, &lnk_cap); - return (ret == 0) && (lnk_cap & PCI_EXP_LNKCAP_LBNC); + return (!ret) && (lnk_cap & PCI_EXP_LNKCAP_LBNC); } static void pcie_enable_link_bandwidth_notification(struct pci_dev *dev) @@ -56,7 +56,7 @@ static irqreturn_t pcie_bw_notification_irq(int irq, void *context) ret = pcie_capability_read_word(port, PCI_EXP_LNKSTA, &link_status); events = link_status & PCI_EXP_LNKSTA_LBMS; - if (ret != 0 || !events) + if (ret || !events) return IRQ_NONE; pcie_capability_write_word(port, PCI_EXP_LNKSTA, events); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ab7e19882b30..60ecebbc7dcf 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1582,7 +1582,7 @@ static bool pci_ext_cfg_is_aliased(struct pci_dev *dev) for (pos = PCI_CFG_SPACE_SIZE; pos < PCI_CFG_SPACE_EXP_SIZE; pos += PCI_CFG_SPACE_SIZE) { - if (pci_read_config_dword(dev, pos, &tmp) != 0 + if (pci_read_config_dword(dev, pos, &tmp) || header != tmp) return false; } @@ -1609,7 +1609,7 @@ static int pci_cfg_space_size_ext(struct pci_dev *dev) u32 status; int pos = PCI_CFG_SPACE_SIZE; - if (pci_read_config_dword(dev, pos, &status) != 0) + if (pci_read_config_dword(dev, pos, &status)) return PCI_CFG_SPACE_SIZE; if (status == 0xffffffff || pci_ext_cfg_is_aliased(dev)) return PCI_CFG_SPACE_SIZE; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e60ef8abd698..8b69d6ebb619 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5116,8 +5116,8 @@ static void quirk_intel_qat_vf_cap(struct pci_dev *pdev) pdev->pcie_mpss = reg16 & PCI_EXP_DEVCAP_PAYLOAD; pdev->cfg_size = PCI_CFG_SPACE_EXP_SIZE; - if (pci_read_config_dword(pdev, PCI_CFG_SPACE_SIZE, &status) != - 0 || (status == 0xffffffff)) + if (pci_read_config_dword(pdev, PCI_CFG_SPACE_SIZE, &status) + || (status == 0xffffffff)) pdev->cfg_size = PCI_CFG_SPACE_SIZE; if (pci_find_saved_cap(pdev, PCI_CAP_ID_EXP)) diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index 7d45b58beacd..a208700000ea 100644 --- a/drivers/pci/syscall.c +++ b/drivers/pci/syscall.c @@ -46,7 +46,7 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn, } err = -EIO; - if (cfg_ret != 0) + if (cfg_ret) goto error; switch (len) { @@ -105,7 +105,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, if (err) break; err = pci_user_write_config_byte(dev, off, byte); - if (err != 0) + if (err) err = -EIO; break; @@ -114,7 +114,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, if (err) break; err = pci_user_write_config_word(dev, off, word); - if (err != 0) + if (err) err = -EIO; break; @@ -123,7 +123,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, if (err) break; err = pci_user_write_config_dword(dev, off, dword); - if (err != 0) + if (err) err = -EIO; break; -- 2.18.2