Merge "msm: ipa: remove status EP setting for WDI WLAN_RX pipe" (2651d80e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/ipa/ipa_client.c

+7 −21

Original line number	Diff line number	Diff line
		@@ -813,7 +813,6 @@ int ipa_connect_wdi_pipe(struct ipa_wdi_in_params *in,
		struct IpaHwWdiTxSetUpCmdData_t *tx;
		struct IpaHwWdiRxSetUpCmdData_t *rx;
		struct ipa_ep_cfg_ctrl ep_cfg_ctrl;
		struct ipa_ep_cfg_status status;

		if (in == NULL \|\| out == NULL \|\| in->sys.client >= IPA_CLIENT_MAX) {
		IPAERR("bad parm. in=%p out=%p\n", in, out);
		@@ -961,16 +960,6 @@ int ipa_connect_wdi_pipe(struct ipa_wdi_in_params *in,
		IPAERR("fail to configure EP.\n");
		goto ipa_cfg_ep_fail;
		}
		if (IPA_CLIENT_IS_PROD(in->sys.client)) {
		status.status_en = true;
		status.status_ep =
		ipa_get_ep_mapping(IPA_CLIENT_APPS_LAN_CONS);
		if (ipa_cfg_ep_status(ipa_ep_idx, &status)) {
		IPAERR("fail to configure status of EP %d\n",
		ipa_ep_idx);
		goto ipa_cfg_ep_fail;
		}
		}
		IPADBG("ep configuration successful\n");
		} else {
		IPADBG("Skipping endpoint configuration.\n");
		@@ -1312,8 +1301,6 @@ int ipa_resume_wdi_pipe(u32 clnt_hdl)
		}
		mutex_unlock(&ipa_ctx->wdi.lock);

		if (IPA_CLIENT_IS_PROD(ep->client) \|\|
		(IPA_CLIENT_IS_CONS(ep->client) && ep->keep_ipa_awake)) {
		memset(&ep_cfg_ctrl, 0 , sizeof(struct ipa_ep_cfg_ctrl));
		result = ipa_cfg_ep_ctrl(clnt_hdl, &ep_cfg_ctrl);
		if (result)
		@@ -1321,7 +1308,6 @@ int ipa_resume_wdi_pipe(u32 clnt_hdl)
		clnt_hdl, result);
		else
		IPADBG("client (ep: %d) un-susp/delay\n", clnt_hdl);
		}

		ep->wdi_state \|= IPA_WDI_RESUMED;
		IPADBG("client (ep: %d) resumed\n", clnt_hdl);