aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/pci.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-08-24 14:08:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-26 10:47:57 -0400
commit22c55e6e7ed46ad3734c206d90b5ccba3b318d22 (patch)
tree500f138a0e99248ae6e74518e8105b62cff11395 /drivers/net/wireless/ath/ath9k/pci.c
parentea5a08cfa5fe9d10333eb7d65a7158ab766dae93 (diff)
ath9k: remove replicated null check in ath_pci_aspm_init
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/pci.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/pci.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index d704c8d9bae..91c2e64de79 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -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)) {