Skip to content

Commit

Permalink
ath9k: remove replicated null check in ath_pci_aspm_init
Browse files Browse the repository at this point in the history
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
John W. Linville committed Aug 26, 2011
1 parent ea5a08c commit 22c55e6
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/net/wireless/ath/ath9k/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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);
Expand All @@ -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)) {
Expand Down

0 comments on commit 22c55e6

Please sign in to comment.