diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:08:51 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:09:04 +0300 |
| commit | b92bd780456fea294baa61aadc0c96f2ee5867a2 (patch) | |
| tree | 4e7972e6a02c981dbfe01af1376a383c5225349a | |
| parent | 5992d8272eb7477f97ac846f191117b51d85fe1f (diff) | |
Revert "msm: ipa3: Fix compilation errors after enabling LLVM"
* We'll take the upstream fix
This reverts commit 072d09418a9391b45941c7e42aaf76da510cd6b6.
Change-Id: Ibdd7fad464627ac7474b76d0792ceb49fb1c59aa
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa_rt.c | 2 | ||||
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c index f85b20c3598f..94f30de88743 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 != NULL) ? rules->rt_tbl_name : ""); + rules->rt_tbl_name ? 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 460ea9124511..cccd597646a7 100644 --- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c @@ -722,8 +722,7 @@ static int ipa3_wwan_add_ul_flt_rule_to_ipa(void) retval = -EFAULT; } - req->install_status = (enum ipa_qmi_result_type_v01) - QMI_RESULT_SUCCESS_V01; + req->install_status = 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++) { |