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

Commit 97b9d78c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: u_bam: Replace usage of port->gr with port_usb"

parents cfb9d6be 521200c2

drivers/usb/gadget/u_bam.c

+6 −9
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ struct gbam_port { 
	spinlock_t		port_lock_dl;



	struct grmnet		*port_usb;

	struct grmnet		*gr;



	struct bam_ch_info	data_ch;
@@ -893,7 +892,7 @@ static void gbam_start(void *param, enum usb_bam_pipe_dir dir) 
	struct bam_ch_info *d;



	if (port) {

		dev = port_to_rmnet(port->gr);

		dev = port_to_rmnet(port->port_usb);

		d = &port->data_ch;

	} else {

		pr_err("%s: port is NULL\n", __func__);
@@ -1158,7 +1157,7 @@ static void gbam2bam_connect_work(struct work_struct *w) 
		return;

	}

	d = &port->data_ch;

	dev = port_to_rmnet(port->gr);

	dev = port_to_rmnet(port->port_usb);



	if (dev && dev->cdev)

		gadget = dev->cdev->gadget;
@@ -1421,7 +1420,7 @@ static int gbam_wake_cb(void *param) 
	struct bam_ch_info *d;

	struct f_rmnet		*dev;



	dev = port_to_rmnet(port->gr);

	dev = port_to_rmnet(port->port_usb);

	d = &port->data_ch;



	pr_debug("%s: woken up by peer\n", __func__);
@@ -1462,7 +1461,7 @@ static void gbam2bam_resume_work(struct work_struct *w) 


	pr_debug("%s: resume work started\n", __func__);

	if (port)

		dev = port_to_rmnet(port->gr);

		dev = port_to_rmnet(port->port_usb);

	if (dev && dev->cdev) {

		gadget = dev->cdev->gadget;

	} else {
@@ -1500,7 +1499,7 @@ static int gbam_peer_reset_cb(void *param) 
	struct usb_gadget *gadget;

	int ret;



	dev = port_to_rmnet(port->gr);

	dev = port_to_rmnet(port->port_usb);

	d = &port->data_ch;



	gadget = dev->cdev->gadget;
@@ -1866,7 +1865,7 @@ void gbam_disconnect(struct grmnet *gr, u8 port_num, enum transport_type trans) 
		port = bam2bam_ports[port_num];



	d = &port->data_ch;

	port->gr = gr;

	port->port_usb = gr;



	if (trans == USB_GADGET_XPORT_BAM)

		gbam_free_buffers(port);
@@ -1971,11 +1970,9 @@ int gbam_connect(struct grmnet *gr, u8 port_num, 
	spin_unlock_irqrestore(&port->port_lock_ul, flags);



	if (d->trans == USB_GADGET_XPORT_BAM2BAM) {

		port->gr = gr;

		d->src_connection_idx = src_connection_idx;

		d->dst_connection_idx = dst_connection_idx;

	} else if (d->trans == USB_GADGET_XPORT_BAM2BAM_IPA) {

		port->gr = gr;

		d->src_connection_idx = src_connection_idx;

		d->dst_connection_idx = dst_connection_idx;

		d->ipa_params.src_pipe = &(d->src_pipe_idx);