OSDN Git Service

msm: ipa3: Fix compilation errors after enabling LLVM
authorPraveen Kurapati <pkurapat@codeaurora.org>
Tue, 26 Mar 2019 06:28:56 +0000 (11:58 +0530)
committerNathan Chancellor <natechancellor@gmail.com>
Fri, 27 Sep 2019 07:42:37 +0000 (00:42 -0700)
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>
drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

index 659d38e..6f5e268 100644 (file)
@@ -1241,7 +1241,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;
        }
index cccd597..460ea91 100644 (file)
@@ -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++) {