From 137b9938849901f8e402da15736125b0a0bd2477 Mon Sep 17 00:00:00 2001 From: Prasanna Karthik Date: Mon, 29 Jun 2015 12:43:32 +0000 Subject: [PATCH] staging:wilc1000: code cleanup Fix reported by coccinelle Removed {} for single statement if block Signed-off-by: Prasanna Karthik Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/fifo_buffer.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wilc1000/fifo_buffer.c b/drivers/staging/wilc1000/fifo_buffer.c index b6c07cfc43d2..86eb82e36be0 100644 --- a/drivers/staging/wilc1000/fifo_buffer.c +++ b/drivers/staging/wilc1000/fifo_buffer.c @@ -31,11 +31,10 @@ u32 FIFO_DeInit(tHANDLE hFifo) u32 u32Error = 0; tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo; if (pstrFifoHandler) { - if (pstrFifoHandler->pu8Buffer) { + if (pstrFifoHandler->pu8Buffer) WILC_FREE (pstrFifoHandler->pu8Buffer); - } else { + else u32Error = 1; - } WILC_FREE (pstrFifoHandler); } else { @@ -52,11 +51,11 @@ u32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, u32 u32BytesToRead, u32 *pu32By if (pstrFifoHandler->u32TotalBytes) { down(&pstrFifoHandler->SemBuffer); - if (u32BytesToRead > pstrFifoHandler->u32TotalBytes) { + if (u32BytesToRead > pstrFifoHandler->u32TotalBytes) *pu32BytesRead = pstrFifoHandler->u32TotalBytes; - } else { + else *pu32BytesRead = u32BytesToRead; - } + if ((pstrFifoHandler->u32ReadOffset + u32BytesToRead) <= pstrFifoHandler->u32BufferLength) { WILC_memcpy(pu8Buffer, pstrFifoHandler->pu8Buffer + pstrFifoHandler->u32ReadOffset, *pu32BytesRead); -- 2.34.1