2017-06-20 20:24:33

by Gustavo A. R. Silva

Subject: [PATCH] usb: musb: compress return logic into one line

Simplify return logic to avoid unnecessary variable assignment.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/usb/musb/musb_host.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index dbe617a..76decb8 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,
--
2.5.0

2017-06-21 14:22:29

by Bin Liu

Subject: Re: [PATCH] usb: musb: compress return logic into one line

Hi Greg,

On Tue, Jun 20, 2017 at 03:24:27PM -0500, Gustavo A. R. Silva wrote:
> Simplify return logic to avoid unnecessary variable assignment.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

My tree is already closed for v4.13. if you want to pick it up directly,
here is my Acked-by, or I will take it for v4.14.

Acked-by: Bin Liu <[email protected]>

Regards,
-Bin.

> ---
> drivers/usb/musb/musb_host.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index dbe617a..76decb8 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,
> --
> 2.5.0
>