From 466ccb70fbff445200431b5700f5230ae09c46e6 Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Thu, 21 Apr 2016 15:13:22 -0700 Subject: [PATCH] qcacld-3.0: Protect cnss_wlan_pm_control under CONFIG_PCI_MSM Add CONFIG_PCI_MSM flag for cnss_wlan_pm_control. CRs-Fixed: 1010156 Change-Id: Icba6ec0952f899a2602751340a45f597eaf87d35 --- core/pld/src/pld_pcie.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/pld/src/pld_pcie.h b/core/pld/src/pld_pcie.h index 4e3191e4dfdf..adc830e4cda7 100644 --- a/core/pld/src/pld_pcie.h +++ b/core/pld/src/pld_pcie.h @@ -88,6 +88,13 @@ static inline void *cnss_get_fw_ptr(void) } #endif +#if (!defined(CONFIG_CNSS)) || (!defined(CONFIG_PCI_MSM)) +static inline int cnss_wlan_pm_control(bool vote) +{ + return 0; +} +#endif + #ifndef CONFIG_CNSS static inline int pld_pcie_get_fw_files_for_target(struct pld_fw_files *pfw_files, @@ -131,10 +138,6 @@ static inline int cnss_wlan_get_dfs_nol(void *info, u16 info_len) { return 0; } -static inline int cnss_wlan_pm_control(bool vote) -{ - return 0; -} static inline void *cnss_get_virt_ramdump_mem(unsigned long *size) { return NULL;