diff options
| author | Yu Wang <yyuwang@codeaurora.org> | 2018-09-04 16:41:32 +0800 |
|---|---|---|
| committer | Yu Wang <yyuwang@codeaurora.org> | 2018-09-04 17:12:09 +0800 |
| commit | 8a9bea16d43b33d14bf36d8599c5a97a4c9bf63d (patch) | |
| tree | 868e0719af0741e98a9fb2bbb8f7e89c2bde84d8 | |
| parent | a253a8319a654d6517ccc0ffb57394070394472f (diff) | |
qcacld-2.0: correct some condition flags in PCIe HIF
The cnss specific functions should be covered by
condition flag CONFIG_CNSS.
The pcie specific files are included only when HIF_PCI
is defined, so there is no need to check the flag again
in these files.
Change-Id: Ie1e16e7fede5e7366ee4b77fffc5cbb736bdb685
CRs-Fixed: 2309839
| -rw-r--r-- | CORE/SERVICES/HIF/PCIe/if_pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c index 8c6739830bfc..39c5a88c2b4b 100644 --- a/CORE/SERVICES/HIF/PCIe/if_pci.c +++ b/CORE/SERVICES/HIF/PCIe/if_pci.c @@ -1937,7 +1937,7 @@ err_region: * power up WLAN host driver when SSR happens. Most of this * function is duplicated from hif_pci_probe(). */ -#ifdef HIF_PCI +#ifdef CONFIG_CNSS int hif_pci_reinit(struct pci_dev *pdev, const struct pci_device_id *id) { void __iomem *mem; @@ -2286,7 +2286,6 @@ err_region: return ret; } -#endif void hif_pci_notify_handler(struct pci_dev *pdev, int state) { @@ -2297,6 +2296,7 @@ void hif_pci_notify_handler(struct pci_dev *pdev, int state) printk(KERN_ERR "%s: Fail to send notify\n", __func__); } } +#endif void hif_nointrs(struct hif_pci_softc *sc) @@ -2621,7 +2621,7 @@ hif_pci_remove(struct pci_dev *pdev) printk(KERN_INFO "pci_remove\n"); } -#ifdef HIF_PCI +#ifdef CONFIG_CNSS static void hif_pci_ssr_fail_ind(void) { v_CONTEXT_t vos_ctx; @@ -3205,10 +3205,8 @@ __hif_pci_resume(struct pci_dev *pdev, bool runtime_pm) pci_set_master(pdev); skip: -#ifdef HIF_PCI /* Keep PCIe bus driver's shadow memory intact */ vos_pcie_shadow_control(pdev, TRUE); -#endif #ifdef DISABLE_L1SS_STATES pci_read_config_dword(pdev, 0x188, &val); |