Skip to contentSkip to conversation

Staging: rtlwifi: Remove unwanted parentheses

PATCH In review Madhumitha Prabakaran 2 participants 3 messages Apr 3, 2019 – Apr 4, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Staging: rtlwifi: Remove unwanted parentheses

Remove unwanted parentheses and use !! idiom in place of ternary operator to make code simple and more understandable.

---
Changes in v2:
- Changed commit log
- Replaced ternary operator with !! idiom
- Modified a BIT operator

---
 drivers/staging/rtlwifi/core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtlwifi/core.c +4 -4
index a9902818ae7e..c70f062cf4b9 100644
@@ -341,8 +341,8 @@ static u16 crc16_ccitt(u8 data, u16 crc)
 	u16 result;
 
 	for (i = 0; i < 8; i++) {
-		crc_bit15 = ((crc & BIT(15)) ? 1 : 0);
-		data_bit  = (data & (BIT(0) << i) ? 1 : 0);
+		crc_bit15 = !!(crc & BIT(15));
+		data_bit  = !!(data & BIT(i));
 		shift_in = crc_bit15 ^ data_bit;
 
 		result = crc << 1;
@@ -351,13 +351,13 @@ static u16 crc16_ccitt(u8 data, u16 crc)
 		else
 			result |= BIT(0);
 
-		crc_bit11 = ((crc & BIT(11)) ? 1 : 0) ^ shift_in;
+		crc_bit11 = !!(crc & BIT(11)) ^ shift_in;
 		if (crc_bit11 == 0)
 			result &= (~BIT(12));
 		else
 			result |= BIT(12);
 
-		crc_bit4 = ((crc & BIT(4)) ? 1 : 0) ^ shift_in;
+		crc_bit4 = !!(crc & BIT(4)) ^ shift_in;
 		if (crc_bit4 == 0)
 			result &= (~BIT(5));
 		else
Signature · 1 line
2.17.1
#1 lore raw

You should probably update the subject line because now it's not just about parentheses any more.

[PATCH v2] Staging: rtlwifi: clean up crc16_ccitt()

So the one thing per patch rule is a little bit about selling your patch. We never allow "Clean up whole_file.c" but we do sometimes allow "Clean up a function()" so long as the patch description sells it in the right way.

Blah blah function does "BIT(0) << i" instead of "BIT(i)". Using !! is slightly shorter than "foo ? 1 : 0". Blah blah, etc.

drivers/staging/rtlwifi/core.c static u16 crc16_ccitt(u8 data, u16 crc) · line 356

Quoted 8 lines · Madhumitha Prabakaran
drivers/staging/rtlwifi/core.c +1 -1
@@ -351,13 +351,13 @@ static u16 crc16_ccitt(u8 data, u16 crc)
 		else
 			result |= BIT(0);
 
-		crc_bit11 = ((crc & BIT(11)) ? 1 : 0) ^ shift_in;
+		crc_bit11 = !!(crc & BIT(11)) ^ shift_in;
 		if (crc_bit11 == 0)
 			result &= (~BIT(12));

^ ^
I thought your Coccinelle script was going to complain about these parentheses. Probably the &= confuses it? There are a couple others in the same function.

regards,
dan carpenter

#2 lore raw
Quoted 5 lines · Dan Carpenter

You should probably update the subject line because now it's not just about parentheses any more.

[PATCH v2] Staging: rtlwifi: clean up crc16_ccitt()

Quoted 7 lines

So the one thing per patch rule is a little bit about selling your patch. We never allow "Clean up whole_file.c" but we do sometimes allow "Clean up a function()" so long as the patch description sells it in the right way.

Blah blah function does "BIT(0) << i" instead of "BIT(i)". Using !! is slightly shorter than "foo ? 1 : 0". Blah blah, etc.

Thanks for feedback!

Quoted 6 lines · Madhumitha Prabakaran
Quoted 4 lines
drivers/staging/rtlwifi/core.c +0 -0
@@ -351,13 +351,13 @@ static u16 crc16_ccitt(u8 data, u16 crc)
 		else
 			result |= BIT(0);
 
Quoted 8 lines

drivers/staging/rtlwifi/core.c static u16 crc16_ccitt(u8 data, u16 crc) · line 356

Quoted 4 lines
drivers/staging/rtlwifi/core.c +1 -1
-		crc_bit11 = ((crc & BIT(11)) ? 1 : 0) ^ shift_in;
+		crc_bit11 = !!(crc & BIT(11)) ^ shift_in;
 		if (crc_bit11 == 0)
 			result &= (~BIT(12));

^ ^
I thought your Coccinelle script was going to complain about these parentheses. Probably the &= confuses it? There are a couple others in the same function.

I didn't included assignment operators in the earlier Coccinelle script. However, I edited it now.

Quoted 3 lines

regards,
dan carpenter