summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorPraveen Kurapati <pkurapat@codeaurora.org>2019-03-26 11:58:56 +0530
committerMichael Bestas <mkbestas@lineageos.org>2020-02-02 01:41:00 +0200
commit072d09418a9391b45941c7e42aaf76da510cd6b6 (patch)
tree31f651188d0879498340aa606a4cc0d25bc5a1bf /drivers/platform
parentfdb099675aed5f42214bfd42bf8ccf21e8a8a3e9 (diff)
msm: ipa3: Fix compilation errors after enabling LLVM
After enabling compilation with LLVM for ipa driver, assignment errors occurred. Added changes to resolve compilation warnings. Change-Id: I66b8c3f37677586955e5aba3250bc24bd93bad62 Signed-off-by: Praveen Kurapati <pkurapat@codeaurora.org> Link: https://source.codeaurora.org/quic/la/kernel/msm-4.9/commit/?id=c347cb0ad2452aaf998531291f773cdc83424c6e Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/msm/ipa/ipa_v3/ipa_rt.c2
-rw-r--r--drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
index 94f30de88743..f85b20c3598f 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
@@ -1243,7 +1243,7 @@ int ipa3_add_rt_rule_after(struct ipa_ioc_add_rt_rule_after *rules)
tbl = __ipa3_find_rt_tbl(rules->ip, rules->rt_tbl_name);
if (tbl == NULL || (tbl->cookie != IPA_RT_TBL_COOKIE)) {
IPAERR_RL("failed finding rt tbl name = %s\n",
- rules->rt_tbl_name ? rules->rt_tbl_name : "");
+ (rules->rt_tbl_name != NULL) ? rules->rt_tbl_name : "");
ret = -EINVAL;
goto bail;
}
diff --git a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
index cccd597646a7..460ea9124511 100644
--- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
@@ -722,7 +722,8 @@ static int ipa3_wwan_add_ul_flt_rule_to_ipa(void)
retval = -EFAULT;
}
- req->install_status = QMI_RESULT_SUCCESS_V01;
+ req->install_status = (enum ipa_qmi_result_type_v01)
+ QMI_RESULT_SUCCESS_V01;
req->rule_id_valid = 1;
req->rule_id_len = rmnet_ipa3_ctx->num_q6_rules;
for (i = 0; i < rmnet_ipa3_ctx->num_q6_rules; i++) {