Commit e98b06b0 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2cdb9a42

drivers/net/wireless/ath/ath5k/attach.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) 
	/*

	 * Write PCI-E power save settings

	 */

	if ((ah->ah_version == AR5K_AR5212) && pdev && (pdev->is_pcie)) {

	if ((ah->ah_version == AR5K_AR5212) && pdev && (pci_is_pcie(pdev))) {

		ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES);

		ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES);

drivers/net/wireless/ath/ath5k/reset.c

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah) 
	 * we ingore that flag for PCI-E cards. On PCI cards

	 * this flag gets cleared after 64 PCI clocks.

	 */

	bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;

	bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI;



	if (ah->ah_version == AR5K_AR5210) {

		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) 
	 * we ingore that flag for PCI-E cards. On PCI cards

	 * this flag gets cleared after 64 PCI clocks.

	 */

	bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;

	bus_flags = (pdev && pci_is_pcie(pdev)) ? 0 : AR5K_RESET_CTL_PCI;



	if (ah->ah_version == AR5K_AR5210) {

		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |

CRA Git | Maintained and supported by SUSTech CRA and CCSE