From 9dd07d1d630dbf04d8dc5646a717f5401bad963a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 17 Dec 2010 14:42:47 -0800 Subject: [PATCH] compat-wireless: use pci_is_pcie() Use pci_is_pcie function and do not access the member of the struct directly. Signed-off-by: Hauke Mehrtens --- patches/20-pcidev.patch | 66 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/patches/20-pcidev.patch b/patches/20-pcidev.patch index 25a39467f985..19feea6fc0eb 100644 --- a/patches/20-pcidev.patch +++ b/patches/20-pcidev.patch @@ -2,17 +2,71 @@ Older kernels than 2.6.24 do not have the is_pcie member as part of the struct pci_dev, to help with that we use the compat-2.6.24.c supplied compat_is_pcie() when needed. +--- 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 + /* + * 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); + +--- 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 + * 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 + * 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 | --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -96,7 +96,11 @@ static void ath_pci_bt_coex_prep(struct +@@ -96,7 +96,7 @@ static void ath_pci_bt_coex_prep(struct struct pci_dev *pdev = to_pci_dev(sc->dev); u8 aspm; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - if (!pdev->is_pcie) -+#else -+ if (!compat_is_pcie(pdev)) -+#endif +- if (!pdev->is_pcie) ++ if (!pci_is_pcie(pdev)) return; pci_read_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, &aspm); +--- a/drivers/net/wireless/rt2x00/rt2x00pci.c ++++ b/drivers/net/wireless/rt2x00/rt2x00pci.c +@@ -301,7 +301,7 @@ int rt2x00pci_probe(struct pci_dev *pci_ + rt2x00dev->irq = pci_dev->irq; + rt2x00dev->name = pci_name(pci_dev); + +- if (pci_dev->is_pcie) ++ if (pci_is_pcie(pci_dev)) + rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE); + else + rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); +--- a/drivers/ssb/scan.c ++++ b/drivers/ssb/scan.c +@@ -405,10 +405,10 @@ int ssb_bus_scan(struct ssb_bus *bus, + /* Ignore PCI cores on PCI-E cards. + * Ignore PCI-E cores on PCI cards. */ + if (dev->id.coreid == SSB_DEV_PCI) { +- if (bus->host_pci->is_pcie) ++ if (pci_is_pcie(bus->host_pci)) + continue; + } else { +- if (!bus->host_pci->is_pcie) ++ if (!pci_is_pcie(bus->host_pci)) + continue; + } + } -- 2.30.2