Merge "msm: IPA: remove the redundent if-else check" (5e88678e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/platform/msm/ipa/ipa_v3/ipa_mhi_proxy.c

+4 −15

Original line number	Diff line number	Diff line
		@@ -382,10 +382,6 @@ static int __imp_configure_mhi_device(
		resp->alloc_resp_arr_len = ridx;
		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
		/* return INCOMPATIBLE_STATE in any case */
		if (mhi_is_active(imp_ctx->md.mhi_dev))
		resp->resp.error =
		IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		else
		resp->resp.error =
		IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		return -EINVAL;
		@@ -551,9 +547,6 @@ struct ipa_mhi_alloc_channel_resp_msg_v01 *imp_handle_allocate_channel_req(
		resp->alloc_resp_arr_len++;
		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
		/* return INCOMPATIBLE_STATE in any case */
		if (mhi_is_active(imp_ctx->md.mhi_dev))
		resp->resp.error = IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		else
		resp->resp.error = IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		goto fail_smmu;
		}
		@@ -642,10 +635,6 @@ struct ipa_mhi_clk_vote_resp_msg_v01
		IMP_ERR("mhi_sync_get failed %d\n", ret);
		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
		/* return INCOMPATIBLE_STATE in any case */
		if (mhi_is_active(imp_ctx->md.mhi_dev))
		resp->resp.error =
		IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		else
		resp->resp.error =
		IPA_QMI_ERR_INCOMPATIBLE_STATE_V01;
		return resp;