samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icnss2: include qcom_aoss.h file at correct place

Browse Source 
For bengal target, getting compilation error due to
Change-Id: Ifc5ff95208e79280543471d56fdb0a87ca973cf5, resulting in
multiple time inclusion of inline definition of the APIs defined in
the header file qcom_aoss.h. This is resulting in linking error.
Move the header file to the correct place in power.c.

Change-Id: I5a0f83fa954feb4656af09527c090f8e7d96bab8
CRs-Fixed: 3595936
This commit is contained in:
Prateek Patil
2023-08-22 17:08:14 +05:30
committed by Rahul Choudhary
parent 0efc799a87
commit e44a22665b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
icnss2/main.h
View File

@@ -14,7 +14,6 @@
#include <linux/power_supply.h> #include <linux/power_supply.h>
#if IS_ENABLED(CONFIG_MSM_QMP) #if IS_ENABLED(CONFIG_MSM_QMP)
#include <linux/mailbox/qmp.h> #include <linux/mailbox/qmp.h>
#include <linux/soc/qcom/qcom_aoss.h>
#endif #endif
#ifdef CONFIG_CNSS_OUT_OF_TREE #ifdef CONFIG_CNSS_OUT_OF_TREE
#include "icnss2.h" #include "icnss2.h"

3
icnss2/power.c
View File

@@ -13,6 +13,9 @@
#include "qmi.h" #include "qmi.h"
#include "debug.h" #include "debug.h"
#include "power.h" #include "power.h"
#if IS_ENABLED(CONFIG_MSM_QMP)
#include <linux/soc/qcom/qcom_aoss.h>
#endif
static struct icnss_vreg_cfg icnss_wcn6750_vreg_list[] = { static struct icnss_vreg_cfg icnss_wcn6750_vreg_list[] = {
{"vdd-cx-mx", 824000, 952000, 0, 0, 0, false, true}, {"vdd-cx-mx", 824000, 952000, 0, 0, 0, false, true},