From 84fbb27b3194a14a051f8bafff5e7c0b9f5d7fbd Mon Sep 17 00:00:00 2001 From: Yun Park Date: Mon, 2 Apr 2018 15:31:01 -0700 Subject: [PATCH] qcacld-3.0: Fix implicit conversion of different enumeration type Fix LLVM compilation error: implicit conversion from enumeration type 'qdf_ipa_wlan_event' to different enumeration type 'qdf_ipa_wlan_event_t' Change-Id: Ie5f09f3e5b6f1e93d344d22483754292d370ce60 CRs-Fixed: 2216820 --- components/ipa/core/inc/wlan_ipa_priv.h | 24 ++++++++++++------------ components/ipa/core/src/wlan_ipa_core.c | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/ipa/core/inc/wlan_ipa_priv.h b/components/ipa/core/inc/wlan_ipa_priv.h index b91fb99f118d..5814ef7ef09b 100644 --- a/components/ipa/core/inc/wlan_ipa_priv.h +++ b/components/ipa/core/inc/wlan_ipa_priv.h @@ -696,20 +696,20 @@ struct wlan_ipa_priv { * * Return: ASCII string representing the IPA WLAN event */ -static inline char *wlan_ipa_wlan_event_to_str(qdf_ipa_wlan_event_t event) +static inline char *wlan_ipa_wlan_event_to_str(qdf_ipa_wlan_event event) { switch (event) { - CASE_RETURN_STRING(WLAN_CLIENT_CONNECT); - CASE_RETURN_STRING(WLAN_CLIENT_DISCONNECT); - CASE_RETURN_STRING(WLAN_CLIENT_POWER_SAVE_MODE); - CASE_RETURN_STRING(WLAN_CLIENT_NORMAL_MODE); - CASE_RETURN_STRING(SW_ROUTING_ENABLE); - CASE_RETURN_STRING(SW_ROUTING_DISABLE); - CASE_RETURN_STRING(WLAN_AP_CONNECT); - CASE_RETURN_STRING(WLAN_AP_DISCONNECT); - CASE_RETURN_STRING(WLAN_STA_CONNECT); - CASE_RETURN_STRING(WLAN_STA_DISCONNECT); - CASE_RETURN_STRING(WLAN_CLIENT_CONNECT_EX); + CASE_RETURN_STRING(QDF_IPA_CLIENT_CONNECT); + CASE_RETURN_STRING(QDF_IPA_CLIENT_DISCONNECT); + CASE_RETURN_STRING(QDF_IPA_AP_CONNECT); + CASE_RETURN_STRING(QDF_IPA_AP_DISCONNECT); + CASE_RETURN_STRING(QDF_IPA_STA_CONNECT); + CASE_RETURN_STRING(QDF_IPA_STA_DISCONNECT); + CASE_RETURN_STRING(QDF_IPA_CLIENT_CONNECT_EX); + CASE_RETURN_STRING(QDF_SWITCH_TO_SCC); + CASE_RETURN_STRING(QDF_SWITCH_TO_MCC); + CASE_RETURN_STRING(QDF_WDI_ENABLE); + CASE_RETURN_STRING(QDF_WDI_DISABLE); default: return "UNKNOWN"; } diff --git a/components/ipa/core/src/wlan_ipa_core.c b/components/ipa/core/src/wlan_ipa_core.c index f9a15a460341..688694b30ed5 100644 --- a/components/ipa/core/src/wlan_ipa_core.c +++ b/components/ipa/core/src/wlan_ipa_core.c @@ -1719,14 +1719,14 @@ end: /** * wlan_host_to_ipa_wlan_event() - convert wlan_ipa_wlan_event to ipa_wlan_event - * @wlan_ipa_event_type: IPA IPA WLAN event to be converted to an ipa_wlan_event + * @wlan_ipa_event_type: event to be converted to an ipa_wlan_event * * Return: qdf_ipa_wlan_event representing the wlan_ipa_wlan_event */ static qdf_ipa_wlan_event wlan_host_to_ipa_wlan_event(enum wlan_ipa_wlan_event wlan_ipa_event_type) { - qdf_ipa_wlan_event_t ipa_event; + qdf_ipa_wlan_event ipa_event; switch (wlan_ipa_event_type) { case WLAN_IPA_CLIENT_CONNECT: