OSDN Git Service

PCI/AER: Remove redundant dev->aer_cap checks
authorKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Tue, 26 May 2020 23:18:26 +0000 (16:18 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Jun 2020 17:03:22 +0000 (12:03 -0500)
pcie_aer_get_firmware_first() checks dev->aer_cap, so we can remove
redundant dev->aer_cap checks in the callers.

Link: https://lore.kernel.org/r/d5ccc7a060ec9cdc234bdae7df8a0a4410f13f42.1590534843.git.sathyanarayanan.kuppuswamy@linux.intel.com
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/pcie/aer.c

index ff41e44..61e8cb2 100644 (file)
@@ -253,13 +253,9 @@ void pci_aer_clear_device_status(struct pci_dev *dev)
 
 int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
 {
-       int pos;
+       int pos = dev->aer_cap;
        u32 status, sev;
 
-       pos = dev->aer_cap;
-       if (!pos)
-               return -EIO;
-
        if (!pcie_aer_is_native(dev))
                return -EIO;
 
@@ -276,13 +272,9 @@ EXPORT_SYMBOL_GPL(pci_aer_clear_nonfatal_status);
 
 void pci_aer_clear_fatal_status(struct pci_dev *dev)
 {
-       int pos;
+       int pos = dev->aer_cap;
        u32 status, sev;
 
-       pos = dev->aer_cap;
-       if (!pos)
-               return;
-
        if (!pcie_aer_is_native(dev))
                return;