2015-06-18 13:27:46

by Sunil Shahu

Subject: [PATCH] drivers: staging: rtl8712: Resolved kernel coding style warnings

1) "else" statement after "if" is unnecessory, hence removed.
2) Fixed line over 80 characters warning.

Signed-off-by: Sunil Shahu <[email protected]>
---
drivers/staging/rtl8712/rtl871x_security.c | 39 ++++++++++++++----------------
1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index bcd1a51..0702caa 100644
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -124,28 +124,25 @@ static u8 crc32_reverseBit(u8 data)

static void crc32_init(void)
{
+ sint i, j;
+ u32 c = 0x12340000;
+ u8 *p = (u8 *)&c, *p1;
+ u8 k;
+
if (bcrc32initialized == 1)
return;
- else {
- sint i, j;
- u32 c;
- u8 *p = (u8 *)&c, *p1;
- u8 k;
-
- c = 0x12340000;
- for (i = 0; i < 256; ++i) {
- k = crc32_reverseBit((u8)i);
- for (c = ((u32)k) << 24, j = 8; j > 0; --j)
- c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY :
- (c << 1);
- p1 = (u8 *)&crc32_table[i];
- p1[0] = crc32_reverseBit(p[3]);
- p1[1] = crc32_reverseBit(p[2]);
- p1[2] = crc32_reverseBit(p[1]);
- p1[3] = crc32_reverseBit(p[0]);
- }
- bcrc32initialized = 1;
+
+ for (i = 0; i < 256; ++i) {
+ k = crc32_reverseBit((u8)i);
+ for (c = ((u32)k) << 24, j = 8; j > 0; --j)
+ c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1);
+ p1 = (u8 *)&crc32_table[i];
+ p1[0] = crc32_reverseBit(p[3]);
+ p1[1] = crc32_reverseBit(p[2]);
+ p1[2] = crc32_reverseBit(p[1]);
+ p1[3] = crc32_reverseBit(p[0]);
}
+ bcrc32initialized = 1;
}

static u32 getcrc32(u8 *buf, u32 len)
@@ -992,8 +989,8 @@ static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, sint a4_exists,
/* Builds the last MIC header block from */
/* header fields. */
/************************************************/
-static void construct_ctr_preload(u8 *ctr_preload, sint a4_exists, sint qc_exists,
- u8 *mpdu, u8 *pn_vector, sint c)
+static void construct_ctr_preload(u8 *ctr_preload, sint a4_exists,
+ sint qc_exists, u8 *mpdu, u8 *pn_vector, sint c)
{
sint i;

--
1.9.1

2015-06-19 04:12:01

by Greg Kroah-Hartman

Subject: Re: [PATCH] drivers: staging: rtl8712: Resolved kernel coding style warnings

On Thu, Jun 18, 2015 at 06:57:34PM +0530, Sunil Shahu wrote:
> 1) "else" statement after "if" is unnecessory, hence removed.
> 2) Fixed line over 80 characters warning.

That's two different things, this should be 2 different patches.

thanks,

greg k-h