PCI/ASPM: Remove redundant PCIe port type checking

We decide in alloc_pcie_link_state() whether to allocate a pcie_link_state
for a device.  After that, it's sufficient to check pdev->link_state.  We
don't need to check the PCIe port type again.

Remove the redundant PCIe port type checking.

[bhelgaas: changelog]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f90d8f2f091d..4e1af7637501 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -675,10 +675,7 @@ void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 {
         struct pcie_link_state *link = pdev->link_state;
 
-        if (aspm_disabled || !pci_is_pcie(pdev) || !link)
-                return;
-        if ((pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) &&
-            (pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM))
+        if (aspm_disabled || !link)
                 return;
         /*
          * Devices changed PM state, we should recheck if latency
@@ -696,16 +693,12 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
 {
         struct pcie_link_state *link = pdev->link_state;
 
-        if (aspm_disabled || !pci_is_pcie(pdev) || !link)
+        if (aspm_disabled || !link)
                 return;
 
         if (aspm_policy != POLICY_POWERSAVE)
                 return;
 
-        if ((pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) &&
-            (pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM))
-                return;
-
         down_read(&pci_bus_sem);
         mutex_lock(&aspm_lock);
         pcie_config_aspm_path(link);
@@ -906,9 +899,7 @@ void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev)
 {
         struct pcie_link_state *link_state = pdev->link_state;
 
-        if (!pci_is_pcie(pdev) ||
-            (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
-             pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM) || !link_state)
+        if (!link_state)
                 return;
 
         if (link_state->aspm_support)
@@ -923,9 +914,7 @@ void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
 {
         struct pcie_link_state *link_state = pdev->link_state;
 
-        if (!pci_is_pcie(pdev) ||
-            (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
-             pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM) || !link_state)
+        if (!link_state)
                 return;
 
         if (link_state->aspm_support)