Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
22c55e6e
Commit
22c55e6e
authored
Aug 24, 2011
by
John W. Linville
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ath9k: remove replicated null check in ath_pci_aspm_init
Signed-off-by:
John W. Linville
<
linville@tuxdriver.com
>
parent
ea5a08cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ath/ath9k/pci.c
+2
-6
No files found.
drivers/net/wireless/ath/ath9k/pci.c
View file @
22c55e6e
...
...
@@ -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
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment