diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-20 20:01:54 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-22 15:43:26 -0500 |
commit | e98b06b09be0fc459806aa4d2c301cfaf268c570 (patch) | |
tree | ed3a19111d8f10dd74e6f97d4eb74b003bfb5d6f /drivers | |
parent | 2cdb9a42f3b4c97088ea0768dbee55ee8863f233 (diff) |
ath5k: Use pci_is_pcie()
Use function pci_is_pcie() instead of accessing struct member directly.
CC: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/attach.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/reset.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 9dbc1fa81795..cdac5cff0177 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c | |||
@@ -276,7 +276,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) | |||
276 | /* | 276 | /* |
277 | * Write PCI-E power save settings | 277 | * Write PCI-E power save settings |
278 | */ | 278 | */ |
279 | if ((ah->ah_version == AR5K_AR5212) && pdev && (pdev->is_pcie)) { | 279 | if ((ah->ah_version == AR5K_AR5212) && pdev && (pci_is_pcie(pdev))) { |
280 | ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES); | 280 | ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES); |
281 | ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES); | 281 | ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES); |
282 | 282 | ||
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c index bc84aaa31446..7297d7b77043 100644 --- a/drivers/net/wireless/ath/ath5k/reset.c +++ b/drivers/net/wireless/ath/ath5k/reset.c | |||
@@ -537,7 +537,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah) | |||
537 | * we ingore that flag for PCI-E cards. On PCI cards | 537 | * we ingore that flag for PCI-E cards. On PCI cards |
538 | * this flag gets cleared after 64 PCI clocks. | 538 | * this flag gets cleared after 64 PCI clocks. |
539 | */ | 539 | */ |
540 | bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI; | 540 | bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI; |
541 | 541 | ||
542 | if (ah->ah_version == AR5K_AR5210) { | 542 | if (ah->ah_version == AR5K_AR5210) { |
543 | ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | | 543 | ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | |
@@ -594,7 +594,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial) | |||
594 | * we ingore that flag for PCI-E cards. On PCI cards | 594 | * we ingore that flag for PCI-E cards. On PCI cards |
595 | * this flag gets cleared after 64 PCI clocks. | 595 | * this flag gets cleared after 64 PCI clocks. |
596 | */ | 596 | */ |
597 | bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI; | 597 | bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI; |
598 | 598 | ||
599 | if (ah->ah_version == AR5K_AR5210) { | 599 | if (ah->ah_version == AR5K_AR5210) { |
600 | ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | | 600 | ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU | |