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

Commit c51e36dc authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Felipe Balbi
Browse files

usb: musb: host: remove duplicate check in musb_ep_program() 



musb_ep_program() contains obviously duplicate check for 'dma_channel' in its
IN/receive path -- removing it allows to save one level of indentation. While
at it, improve the comment style...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 981430a1

drivers/usb/musb/musb_host.c

+22 −27
Original line number Diff line number Diff line
@@ -837,34 +837,29 @@ static void musb_ep_program(struct musb *musb, u8 epnum, 
		/* kick things off */



		if ((is_cppi_enabled() || tusb_dma_omap()) && dma_channel) {

			/* candidate for DMA */

			if (dma_channel) {

			/* Candidate for DMA */

			dma_channel->actual_len = 0L;

			qh->segsize = len;



			/* AUTOREQ is in a DMA register */

			musb_writew(hw_ep->regs, MUSB_RXCSR, csr);

				csr = musb_readw(hw_ep->regs,

						MUSB_RXCSR);

			csr = musb_readw(hw_ep->regs, MUSB_RXCSR);



				/* unless caller treats short rx transfers as

			/*

			 * Unless caller treats short RX transfers as

			 * errors, we dare not queue multiple transfers.

			 */

				dma_ok = dma_controller->channel_program(

						dma_channel, packet_sz,

						!(urb->transfer_flags

							& URB_SHORT_NOT_OK),

			dma_ok = dma_controller->channel_program(dma_channel,

					packet_sz, !(urb->transfer_flags &

						     URB_SHORT_NOT_OK),

					urb->transfer_dma + offset,

					qh->segsize);

			if (!dma_ok) {

					dma_controller->channel_release(

							dma_channel);

					hw_ep->rx_channel = NULL;

					dma_channel = NULL;

				dma_controller->channel_release(dma_channel);

				hw_ep->rx_channel = dma_channel = NULL;

			} else

				csr |= MUSB_RXCSR_DMAENAB;

		}

		}



		csr |= MUSB_RXCSR_H_REQPKT;

		dev_dbg(musb->controller, "RXCSR%d := %04x\n", epnum, csr);