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

Commit 2eb2cff5 authored by Ido Shayevitz's avatar Ido Shayevitz Committed by Felipe Balbi
Browse files

usb: gadget: Update m66592-udc to use usb_endpoint_descriptor inside the struct usb_ep 



Remove redundant pointer to struct usb_endpoint_descriptor.

Signed-off-by: default avatarIdo Shayevitz <idos@codeaurora.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent a1976f75

drivers/usb/gadget/m66592-udc.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -390,7 +390,7 @@ static int alloc_pipe_config(struct m66592_ep *ep, 
	int *counter;

	int *counter;

	int ret;

	int ret;





	ep->desc = desc;

	ep->ep.desc = desc;





	BUG_ON(ep->pipenum);

	BUG_ON(ep->pipenum);
@@ -558,7 +558,7 @@ static void start_packet_read(struct m66592_ep *ep, struct m66592_request *req) 




static void start_packet(struct m66592_ep *ep, struct m66592_request *req)

static void start_packet(struct m66592_ep *ep, struct m66592_request *req)

{

{

	if (ep->desc->bEndpointAddress & USB_DIR_IN)

	if (ep->ep.desc->bEndpointAddress & USB_DIR_IN)

		start_packet_write(ep, req);

		start_packet_write(ep, req);

	else

	else

		start_packet_read(ep, req);

		start_packet_read(ep, req);
@@ -734,7 +734,7 @@ __acquires(m66592->lock) 




	if (restart) {

	if (restart) {

		req = list_entry(ep->queue.next, struct m66592_request, queue);

		req = list_entry(ep->queue.next, struct m66592_request, queue);

		if (ep->desc)

		if (ep->ep.desc)

			start_packet(ep, req);

			start_packet(ep, req);

	}

	}

}

}
@@ -917,7 +917,7 @@ static void irq_pipe_ready(struct m66592 *m66592, u16 status, u16 enb) 
				ep = m66592->pipenum2ep[pipenum];

				ep = m66592->pipenum2ep[pipenum];

				req = list_entry(ep->queue.next,

				req = list_entry(ep->queue.next,

						 struct m66592_request, queue);

						 struct m66592_request, queue);

				if (ep->desc->bEndpointAddress & USB_DIR_IN)

				if (ep->ep.desc->bEndpointAddress & USB_DIR_IN)

					irq_packet_write(ep, req);

					irq_packet_write(ep, req);

				else

				else

					irq_packet_read(ep, req);

					irq_packet_read(ep, req);
@@ -1377,7 +1377,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req, 
	req->req.actual = 0;

	req->req.actual = 0;

	req->req.status = -EINPROGRESS;

	req->req.status = -EINPROGRESS;





	if (ep->desc == NULL)	/* control */

	if (ep->ep.desc == NULL)	/* control */

		start_ep0(ep, req);

		start_ep0(ep, req);

	else {

	else {

		if (request && !ep->busy)

		if (request && !ep->busy)

drivers/usb/gadget/m66592-udc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -456,7 +456,7 @@ struct m66592_ep { 
	unsigned		use_dma:1;

	unsigned		use_dma:1;

	u16			pipenum;

	u16			pipenum;

	u16			type;

	u16			type;

	const struct usb_endpoint_descriptor	*desc;



	/* register address */

	/* register address */

	unsigned long		fifoaddr;

	unsigned long		fifoaddr;

	unsigned long		fifosel;

	unsigned long		fifosel;