Merge "msm: ipa: unify wdi 1/2 and wdi 3 API" (3baecc61) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/platform/msm/ipa/ipa_api.c

+14 −13

Original line number	Original line	Diff line number	Diff line
	@@ -3127,52 +3127,53 @@ int ipa_get_smmu_params(struct ipa_smmu_in_params *in,
	EXPORT_SYMBOL(ipa_get_smmu_params);		EXPORT_SYMBOL(ipa_get_smmu_params);

	/**		/**
	* ipa_conn_wdi3_pipes() - connect wdi3 pipes		* ipa_conn_wdi_pipes() - connect wdi pipes
	*/		*/
	int ipa_conn_wdi3_pipes(struct ipa_wdi3_conn_in_params *in,		int ipa_conn_wdi_pipes(struct ipa_wdi_conn_in_params *in,
	struct ipa_wdi3_conn_out_params *out)		struct ipa_wdi_conn_out_params *out,
			ipa_wdi_meter_notifier_cb wdi_notify)
	{		{
	int ret;		int ret;

	IPA_API_DISPATCH_RETURN(ipa_conn_wdi3_pipes, in, out);		IPA_API_DISPATCH_RETURN(ipa_conn_wdi_pipes, in, out, wdi_notify);

	return ret;		return ret;
	}		}

	/**		/**
	* ipa_disconn_wdi3_pipes() - disconnect wdi3 pipes		* ipa_disconn_wdi_pipes() - disconnect wdi pipes
	*/		*/
	int ipa_disconn_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)		int ipa_disconn_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)
	{		{
	int ret;		int ret;

	IPA_API_DISPATCH_RETURN(ipa_disconn_wdi3_pipes, ipa_ep_idx_tx,		IPA_API_DISPATCH_RETURN(ipa_disconn_wdi_pipes, ipa_ep_idx_tx,
	ipa_ep_idx_rx);		ipa_ep_idx_rx);

	return ret;		return ret;
	}		}

	/**		/**
	* ipa_enable_wdi3_pipes() - enable wdi3 pipes		* ipa_enable_wdi_pipes() - enable wdi pipes
	*/		*/
	int ipa_enable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)		int ipa_enable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)
	{		{
	int ret;		int ret;

	IPA_API_DISPATCH_RETURN(ipa_enable_wdi3_pipes, ipa_ep_idx_tx,		IPA_API_DISPATCH_RETURN(ipa_enable_wdi_pipes, ipa_ep_idx_tx,
	ipa_ep_idx_rx);		ipa_ep_idx_rx);

	return ret;		return ret;
	}		}

	/**		/**
	* ipa_disable_wdi3_pipes() - disable wdi3 pipes		* ipa_disable_wdi_pipes() - disable wdi pipes
	*/		*/
	int ipa_disable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)		int ipa_disable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)
	{		{
	int ret;		int ret;

	IPA_API_DISPATCH_RETURN(ipa_disable_wdi3_pipes, ipa_ep_idx_tx,		IPA_API_DISPATCH_RETURN(ipa_disable_wdi_pipes, ipa_ep_idx_tx,
	ipa_ep_idx_rx);		ipa_ep_idx_rx);

	return ret;		return ret;

drivers/platform/msm/ipa/ipa_api.h

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -398,16 +398,17 @@ struct ipa_api_controller {

	void (*ipa_ntn_uc_dereg_rdyCB)(void);		void (*ipa_ntn_uc_dereg_rdyCB)(void);

	int (ipa_conn_wdi3_pipes)(struct ipa_wdi3_conn_in_params in,		int (ipa_conn_wdi_pipes)(struct ipa_wdi_conn_in_params in,
	struct ipa_wdi3_conn_out_params *out);		struct ipa_wdi_conn_out_params *out,
			ipa_wdi_meter_notifier_cb wdi_notify);

	int (*ipa_disconn_wdi3_pipes)(int ipa_ep_idx_tx,		int (*ipa_disconn_wdi_pipes)(int ipa_ep_idx_tx,
	int ipa_ep_idx_rx);		int ipa_ep_idx_rx);

	int (*ipa_enable_wdi3_pipes)(int ipa_ep_idx_tx,		int (*ipa_enable_wdi_pipes)(int ipa_ep_idx_tx,
	int ipa_ep_idx_rx);		int ipa_ep_idx_rx);

	int (*ipa_disable_wdi3_pipes)(int ipa_ep_idx_tx,		int (*ipa_disable_wdi_pipes)(int ipa_ep_idx_tx,
	int ipa_ep_idx_rx);		int ipa_ep_idx_rx);

	int (ipa_tz_unlock_reg)(struct ipa_tz_unlock_reg_info reg_info,		int (ipa_tz_unlock_reg)(struct ipa_tz_unlock_reg_info reg_info,