Skip to contentSkip to conversation

drivers: staging: rtl8712: remove unnecessory else statement

PATCH In review Sunil Shahu 3 participants 6 messages Jun 19, 2015 – Jun 26, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: staging: rtl8712: remove unnecessory else statement

"else" statement after "if" is unnecessory, hence removed.

---
 drivers/staging/rtl8712/rtl871x_security.c | 35 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/staging/rtl8712/rtl871x_security.c +16 -19
index bcd1a51..21465c9 100644
@@ -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)
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 6 lines · Sunil Shahu

"else" statement after "if" is unnecessory, hence removed.

---
 drivers/staging/rtl8712/rtl871x_security.c | 35 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

You sent 2 patches, with identical subjects, yet no indication of which to take, so I'm going to delete both of them from my queue and wait for you to send a v2 patch like should be properly done.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw

PATCH v2 1/1 drivers: staging: rtl8712: remove unnecessary else statement

"else" statement after "if" is unnecessary, hence removed.

---
 drivers/staging/rtl8712/rtl871x_security.c | 35 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/staging/rtl8712/rtl871x_security.c +16 -19
index bcd1a51..21465c9 100644
@@ -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)
Signature · 5 lines
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/
#3 lore raw

Re: [PATCH v2] drivers: staging: rtl8712: remove unnecessary else statement

Quoted 12 lines · Sunil Shahu

"else" statement after "if" is unnecessary, hence removed.

---
 drivers/staging/rtl8712/rtl871x_security.c | 35 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/staging/rtl8712/rtl871x_security.c +0 -0
index bcd1a51..21465c9 100644

drivers/staging/rtl8712/rtl871x_security.c static u8 crc32_reverseBit(u8 data) · line 128

Quoted 5 lines
drivers/staging/rtl8712/rtl871x_security.c +2 -0
@@ -124,28 +124,25 @@ static u8 crc32_reverseBit(u8 data)
 
 static void crc32_init(void)
 {
+	sint i, j;
+	u32 c = 0x12340000;
                ^^^^^^^^^^

In another follow on patch you can get rid of this. It is nonsense and it isn't used.

Quoted 18 lines
drivers/staging/rtl8712/rtl871x_security.c +3 -13
+	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];

drivers/staging/rtl8712/rtl871x_security.c static u8 crc32_reverseBit(u8 data) · line 137

Quoted 10 lines
drivers/staging/rtl8712/rtl871x_security.c +4 -6
-			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)
                     ^^^^^^^^^^^^^^^^^^

We always re-initialize c here.

drivers/staging/rtl8712/rtl871x_security.c static u8 crc32_reverseBit(u8 data) · line 146

Quoted 9 lines
drivers/staging/rtl8712/rtl871x_security.c +7 -0
+			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;
 }

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/

#4 lore raw

Re: [PATCH v2] drivers: staging: rtl8712: remove unnecessary else statement

Hi Dan,

Quoted 5 lines · Dan Carpenter
Quoted 1 line

+ u32 c = 0x12340000;

                ^^^^^^^^^^

In another follow on patch you can get rid of this. It is nonsense and
it isn't used.

By "follow on patch", did you mean that I should send v3 revision of my patch or send a new patch after this patch gets applied to the tree?

#5 lore raw

Re: [PATCH v2] drivers: staging: rtl8712: remove unnecessary else statement

Quoted 11 lines · Sunil Shahu

Hi Dan,

Quoted 5 lines · Dan Carpenter
Quoted 1 line

+ u32 c = 0x12340000;

                ^^^^^^^^^^

In another follow on patch you can get rid of this. It is nonsense and
it isn't used.

By "follow on patch", did you mean that I should send v3 revision of my patch or send a new patch after this patch gets applied to the tree?

Send a new patch. You don't have to wait, you can just assume it will be merged and build on top of it.

It will take a few weeks before your patch actually gets merged.

regards,
dan carpenter