ath9k: remove replicated null check in ath_pci_aspm_init
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Aug 2011 18:08:41 +0000 (14:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Aug 2011 14:47:57 +0000 (10:47 -0400)
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

index d704c8d9bae76af6299c825f9cff7413346514cc..91c2e64de799e0f7d52c162830872927a17f46a6 100644 (file)
@@ -115,6 +115,8 @@ static void ath_pci_aspm_init(struct ath_common *common)
                return;
 
        parent = pdev->bus->self;
+       if (!parent)
+               return;
 
        if (ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) {
                /* Bluetooth coexistance requires disabling ASPM. */
@@ -126,9 +128,6 @@ static void ath_pci_aspm_init(struct ath_common *common)
                 * Both upstream and downstream PCIe components should
                 * have the same ASPM settings.
                 */
-               if (!parent)
-                       return;
-
                pos = pci_pcie_cap(parent);
                pci_read_config_byte(parent, pos + PCI_EXP_LNKCTL, &aspm);
                aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
@@ -137,9 +136,6 @@ static void ath_pci_aspm_init(struct ath_common *common)
                return;
        }
 
-       if (!parent)
-               return;
-
        pos = pci_pcie_cap(parent);
        pci_read_config_byte(parent, pos +  PCI_EXP_LNKCTL, &aspm);
        if (aspm & (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1)) {