Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3d034db authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: f_gsi: Fix typecasting of usb_prot_id"

parents 12eeab95 322258a2

drivers/usb/gadget/function/f_gsi.c

+9 −8
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static int ipa_connect_channels(struct gsi_data_port *d_port) 
		(gsi->prot_id != USB_PROT_DIAG_IPA) ? IPA_CLIENT_USB_CONS :

						IPA_CLIENT_USB_DPL_CONS;

	in_params->ipa_ep_cfg.mode.mode = IPA_BASIC;

	in_params->teth_prot = (int)gsi->prot_id;

	in_params->teth_prot = (enum ipa_usb_teth_prot)gsi->prot_id;

	in_params->gevntcount_low_addr =

		gsi_channel_info.gevntcount_low_addr;

	in_params->gevntcount_hi_addr =
@@ -634,7 +634,7 @@ static int ipa_connect_channels(struct gsi_data_port *d_port) 
		log_event_dbg("%s: USB GSI OUT OPS Completed", __func__);

		out_params->client = IPA_CLIENT_USB_PROD;

		out_params->ipa_ep_cfg.mode.mode = IPA_BASIC;

		out_params->teth_prot = (int)gsi->prot_id;

		out_params->teth_prot = (enum ipa_usb_teth_prot)gsi->prot_id;

		out_params->gevntcount_low_addr =

			gsi_channel_info.gevntcount_low_addr;

		out_params->gevntcount_hi_addr =
@@ -682,7 +682,7 @@ static int ipa_connect_channels(struct gsi_data_port *d_port) 
	conn_params->usb_to_ipa_xferrscidx_valid =

			(gsi->prot_id != USB_PROT_DIAG_IPA) ? true : false;

	conn_params->ipa_to_usb_xferrscidx_valid = true;

	conn_params->teth_prot = (int)gsi->prot_id;

	conn_params->teth_prot = (enum ipa_usb_teth_prot)gsi->prot_id;

	conn_params->teth_prot_params.max_xfer_size_bytes_to_dev = 23700;

	conn_params->teth_prot_params.max_xfer_size_bytes_to_dev

				= d_port->out_aggr_size;
@@ -803,7 +803,8 @@ static void ipa_disconnect_work_handler(struct gsi_data_port *d_port) 
	log_event_dbg("%s: Calling xdci_disconnect", __func__);



	ret = ipa_usb_xdci_disconnect(gsi->d_port.out_channel_handle,

			gsi->d_port.in_channel_handle, (int)gsi->prot_id);

				gsi->d_port.in_channel_handle,

				(enum ipa_usb_teth_prot)gsi->prot_id);

	if (ret)

		log_event_err("%s: IPA disconnect failed %d",

				__func__, ret);
@@ -847,7 +848,7 @@ static int ipa_suspend_work_handler(struct gsi_data_port *d_port) 
	log_event_dbg("%s: Calling xdci_suspend", __func__);

	ret = ipa_usb_xdci_suspend(gsi->d_port.out_channel_handle,

				gsi->d_port.in_channel_handle,

				(int)gsi->prot_id,

				(enum ipa_usb_teth_prot)gsi->prot_id,

				usb_gsi_remote_wakeup_allowed(f));

	if (!ret) {

		d_port->sm_state = STATE_SUSPENDED;
@@ -881,7 +882,7 @@ static void ipa_resume_work_handler(struct gsi_data_port *d_port) 


	ret = ipa_usb_xdci_resume(gsi->d_port.out_channel_handle,

					gsi->d_port.in_channel_handle,

					(int)gsi->prot_id);

					(enum ipa_usb_teth_prot)gsi->prot_id);

	if (ret)

		log_event_dbg("%s: xdci_resume ret %d", __func__, ret);
@@ -3362,7 +3363,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
	}



	gsi->d_port.ipa_usb_notify_cb = ipa_usb_notify_cb;

	status = ipa_usb_init_teth_prot((int)gsi->prot_id,

	status = ipa_usb_init_teth_prot((enum ipa_usb_teth_prot)gsi->prot_id,

		&gsi->d_port.ipa_init_params, gsi->d_port.ipa_usb_notify_cb,

		gsi);

	if (status) {
@@ -3412,7 +3413,7 @@ static void gsi_unbind(struct usb_configuration *c, struct usb_function *f) 
	 * with ipa driver shall not fail due to unexpected state.

	 */

	drain_workqueue(gsi->d_port.ipa_usb_wq);

	ipa_usb_deinit_teth_prot((int)gsi->prot_id);

	ipa_usb_deinit_teth_prot((enum ipa_usb_teth_prot)gsi->prot_id);



skip_ipa_dinit:

	if (gsi->prot_id == USB_PROT_RNDIS_IPA) {