From: Gustavo A. R. Silva Date: Wed, 21 Jun 2017 14:22:15 +0000 (-0500) Subject: usb: musb: compress return logic into one line X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~7545^2~10 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c68bb0ef177bbcaba505ed492101095c613dafa6;p=mirror_ubuntu-focal-kernel.git usb: musb: compress return logic into one line Simplify return logic to avoid unnecessary variable assignment. Signed-off-by: Gustavo A. R. Silva Acked-by: Bin Liu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index dbe617a735d8..76decb8011eb 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -1540,7 +1540,7 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma, struct dma_channel *channel = hw_ep->rx_channel; void __iomem *epio = hw_ep->regs; dma_addr_t *buf; - u32 length, res; + u32 length; u16 val; buf = (void *)urb->iso_frame_desc[qh->iso_idx].offset + @@ -1552,10 +1552,8 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma, val |= MUSB_RXCSR_DMAENAB; musb_writew(hw_ep->regs, MUSB_RXCSR, val); - res = dma->channel_program(channel, qh->maxpacket, 0, + return dma->channel_program(channel, qh->maxpacket, 0, (u32)buf, length); - - return res; } #else static inline int musb_rx_dma_iso_cppi41(struct dma_controller *dma,