PCI/ASPM: Remove unnecessary ASPM_STATE_L1SS check

Previously aspm_l1ss_init() checked if ASPM_STATE_L1SS is supported before
calling aspm_calc_l12_info(), only for that function to return if
ASPM_STATE_L1_2_MASK is not supported. Simplify the logic by directly
checking for ASPM_STATE_L1_2_MASK.

Link: https://lore.kernel.org/r/20230504111301.229358-6-ajayagarwal@google.com
Signed-off-by: Ajay Agarwal <ajayagarwal@google.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index d3d8dfe1fb7312e8923c60a3ebc133395638c3d7..72cdb30a924ae134ed540f00a62d4741fe4afc96 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -481,9 +481,6 @@ static void aspm_calc_l12_info(struct pcie_link_state *link,
        u32 pctl1, pctl2, cctl1, cctl2;
        u32 pl1_2_enables, cl1_2_enables;
 
-       if (!(link->aspm_support & ASPM_STATE_L1_2_MASK))
-               return;
-
        /* Choose the greater of the two Port Common_Mode_Restore_Times */
        val1 = (parent_l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8;
        val2 = (child_l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8;
@@ -616,7 +613,7 @@ static void aspm_l1ss_init(struct pcie_link_state *link)
        if (parent_l1ss_ctl1 & child_l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_2)
                link->aspm_enabled |= ASPM_STATE_L1_2_PCIPM;
 
-       if (link->aspm_support & ASPM_STATE_L1SS)
+       if (link->aspm_support & ASPM_STATE_L1_2_MASK)
                aspm_calc_l12_info(link, parent_l1ss_cap, child_l1ss_cap);
 }