Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ath9k: remove replicated null check in ath_pci_aspm_init

Browse source 
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2011-08-24 14:08:41 -04:00
parent ea5a08cfa5
commit 22c55e6e7e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/ath/ath9k/pci.c
View file

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