Skip to contentSkip to conversation

staging: vt6655: Fix line wrapping in `RFvWriteWakeProgSyn`

PATCH In review Karolina Drobnik 2 participants 10 messages Nov 15, 2021 Staging

lore
Share & tools
lore
#0 lore raw

v3 cover staging: vt6655: Fix line wrapping in `RFvWriteWakeProgSyn`

This patch set is a series of small refactorings of the function RFvWriteWakeProgSyn, now renamed to rf_write_wake_prog_syn. The work here allowed to shorten lines marked by checkpatch.pl as being too long by:
* introducing two new temporary variables (idx and init_table)
* rewriting a conditional to switch between two modes of AL7320 initialization.

In addition to this, the patch set renames the function to align it with the kernel coding style, updates the function description and removes two unnecessary conditionals checking if the value of init_count is lower than a predefined value.

Changes in v3:
* add a patch for removing the type cast as a first change, suggested by Dan Carpenter <[email protected]>
* merge two patches (using incrementation in idx and cleanup) into one, partially implementing Dan's suggestion

Changes in v2:
* drop "staging: vt6655: Introduce data temporary variable" patch, suggested by Julia Lawall <[email protected]>
* amend "staging: vt6655: Rewrite conditional in AL7320 initialization" patch to use indexing and init_table temporary variable
* add two new patches to remove unnecessary checks for init count, suggested by Mike Rapoport <[email protected]>:
- "staging: vt6655: Delete bogus check for init_count in AL2230"
- "staging: vt6655: Delete bogus check for init_count in AL7230"

Karolina Drobnik (8):
staging: vt6655: Remove unnecessary type casts
staging: vt6655: Introduce idx variable
staging: vt6655: Use incrementation in idx
staging: vt6655: Rewrite conditional in AL7320 initialization
staging: vt6655: Rename RFvWriteWakeProgSyn function
staging: vt6655: Update comment for rf_write_wake_prog_syn
staging: vt6655: Delete bogus check for init_count in AL2230
staging: vt6655: Delete bogus check for init_count in AL7230

 drivers/staging/vt6655/channel.c |  2 +-
 drivers/staging/vt6655/rf.c      | 44 +++++++++++++-------------------
 drivers/staging/vt6655/rf.h      |  2 +-
 3 files changed, 20 insertions(+), 28 deletions(-)
Signature · 1 line
2.30.2
#1 lore raw

PATCH v3 1/8 staging: vt6655: Remove unnecessary type casts

Remove casts to unsigned short in RFvWriteWakeProgSyn function as they are not needed.

---
 drivers/staging/vt6655/rf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/vt6655/rf.c +8 -8
index bc4abe77db7b..aa90890c5c7a 100644
@@ -699,11 +699,11 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 			return false;
 
 		for (i = 0; i < CB_AL2230_INIT_SEQ; i++)
-			MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al2230_init_table[i]);
+			MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_init_table[i]);
 
-		MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al2230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_channel_table0[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al2230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_channel_table1[channel - 1]);
 		break;
 
 		/* Need to check, PLLON need to be low for channel setting */
@@ -716,17 +716,17 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 
 		if (channel <= CB_MAX_CHANNEL_24G) {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al7230_init_table[i]);
+				MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_init_table[i]);
 		} else {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al7230_init_table_a_mode[i]);
+				MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_init_table_a_mode[i]);
 		}
 
-		MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al7230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table0[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al7230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table1[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, (unsigned short)(MISCFIFO_SYNDATA_IDX + i), al7230_channel_table2[channel - 1]);
+		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table2[channel - 1]);
 		break;
 
 	case RF_NOTHING:
Signature · 1 line
2.30.2
#2 lore raw

PATCH v3 2/8 staging: vt6655: Introduce `idx` variable

In reply to Karolina Drobnik

Add a local variable to store MISCFIFO_SYNDATA_IDX offset. This change helps in shortening the lines in rf.c that are deemed too long by checkpatch.pl.

---
 drivers/staging/vt6655/rf.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/staging/vt6655/rf.c +9 -8
index aa90890c5c7a..d57fab3f10fb 100644
@@ -683,6 +683,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 	int i;
 	unsigned char init_count = 0;
 	unsigned char sleep_count = 0;
+	unsigned short idx = MISCFIFO_SYNDATA_IDX;
 
 	VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0);
 	switch (rf_type) {
@@ -699,11 +700,11 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 			return false;
 
 		for (i = 0; i < CB_AL2230_INIT_SEQ; i++)
-			MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_init_table[i]);
+			MACvSetMISCFifo(priv, idx + i, al2230_init_table[i]);
 
-		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, idx + i, al2230_channel_table0[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al2230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, idx + i, al2230_channel_table1[channel - 1]);
 		break;
 
 		/* Need to check, PLLON need to be low for channel setting */
@@ -716,17 +717,17 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 
 		if (channel <= CB_MAX_CHANNEL_24G) {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_init_table[i]);
+				MACvSetMISCFifo(priv, idx + i, al7230_init_table[i]);
 		} else {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_init_table_a_mode[i]);
+				MACvSetMISCFifo(priv, idx + i, al7230_init_table_a_mode[i]);
 		}
 
-		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, idx + i, al7230_channel_table0[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, idx + i, al7230_channel_table1[channel - 1]);
 		i++;
-		MACvSetMISCFifo(priv, MISCFIFO_SYNDATA_IDX + i, al7230_channel_table2[channel - 1]);
+		MACvSetMISCFifo(priv, idx + i, al7230_channel_table2[channel - 1]);
 		break;
 
 	case RF_NOTHING:
Signature · 1 line
2.30.2
#3 lore raw

PATCH v3 3/8 staging: vt6655: Use incrementation in `idx`

In reply to Karolina Drobnik

Increment idx in a loop instead of adding the loop counter i to do so. Delete increments of i that were rendered unnecessary by this change.

---
 drivers/staging/vt6655/rf.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/staging/vt6655/rf.c +8 -11
index d57fab3f10fb..ce91a03eb58f 100644
@@ -700,11 +700,10 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 			return false;
 
 		for (i = 0; i < CB_AL2230_INIT_SEQ; i++)
-			MACvSetMISCFifo(priv, idx + i, al2230_init_table[i]);
+			MACvSetMISCFifo(priv, idx++, al2230_init_table[i]);
 
-		MACvSetMISCFifo(priv, idx + i, al2230_channel_table0[channel - 1]);
-		i++;
-		MACvSetMISCFifo(priv, idx + i, al2230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, idx++, al2230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, idx++, al2230_channel_table1[channel - 1]);
 		break;
 
 		/* Need to check, PLLON need to be low for channel setting */
@@ -717,17 +716,15 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 
 		if (channel <= CB_MAX_CHANNEL_24G) {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, idx + i, al7230_init_table[i]);
+				MACvSetMISCFifo(priv, idx++, al7230_init_table[i]);
 		} else {
 			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, idx + i, al7230_init_table_a_mode[i]);
+				MACvSetMISCFifo(priv, idx++, al7230_init_table_a_mode[i]);
 		}
 
-		MACvSetMISCFifo(priv, idx + i, al7230_channel_table0[channel - 1]);
-		i++;
-		MACvSetMISCFifo(priv, idx + i, al7230_channel_table1[channel - 1]);
-		i++;
-		MACvSetMISCFifo(priv, idx + i, al7230_channel_table2[channel - 1]);
+		MACvSetMISCFifo(priv, idx++, al7230_channel_table0[channel - 1]);
+		MACvSetMISCFifo(priv, idx++, al7230_channel_table1[channel - 1]);
+		MACvSetMISCFifo(priv, idx++, al7230_channel_table2[channel - 1]);
 		break;
 
 	case RF_NOTHING:
Signature · 1 line
2.30.2
#4 lore raw

PATCH v3 4/8 staging: vt6655: Rewrite conditional in AL7320 initialization

In reply to Karolina Drobnik

Use conditional operator to determine which table for AL7320 initialization should be used. Introduce init_table variable to store this value.

---
 drivers/staging/vt6655/rf.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/staging/vt6655/rf.c +5 -7
index ce91a03eb58f..5246ba211ffb 100644
@@ -684,6 +684,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 	unsigned char init_count = 0;
 	unsigned char sleep_count = 0;
 	unsigned short idx = MISCFIFO_SYNDATA_IDX;
+	const unsigned long *init_table;
 
 	VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0);
 	switch (rf_type) {
@@ -714,13 +715,10 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
 		if (init_count > (MISCFIFO_SYNDATASIZE - sleep_count))
 			return false;
 
-		if (channel <= CB_MAX_CHANNEL_24G) {
-			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, idx++, al7230_init_table[i]);
-		} else {
-			for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
-				MACvSetMISCFifo(priv, idx++, al7230_init_table_a_mode[i]);
-		}
+		init_table = (channel <= CB_MAX_CHANNEL_24G) ?
+			al7230_init_table : al7230_init_table_a_mode;
+		for (i = 0; i < CB_AL7230_INIT_SEQ; i++)
+			MACvSetMISCFifo(priv, idx++, init_table[i]);
 
 		MACvSetMISCFifo(priv, idx++, al7230_channel_table0[channel - 1]);
 		MACvSetMISCFifo(priv, idx++, al7230_channel_table1[channel - 1]);
Signature · 1 line
2.30.2
#5 lore raw

PATCH v3 5/8 staging: vt6655: Rename `RFvWriteWakeProgSyn` function

In reply to Karolina Drobnik

To align with the kernel coding style, remove the type from the function name and do not use CamelCase.

Fix issue detected by checkpatch.pl:
CHECK: Avoid CamelCase: <RFvWriteWakeProgSyn>

---
 drivers/staging/vt6655/channel.c | 2 +-
 drivers/staging/vt6655/rf.c      | 4 ++--
 drivers/staging/vt6655/rf.h      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vt6655/channel.c +1 -1
index b550a1a0844e..e37c8e35a45b 100644
@@ -189,7 +189,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
 
 	/* Init Synthesizer Table */
 	if (priv->bEnablePSMode)
-		RFvWriteWakeProgSyn(priv, priv->byRFType, ch->hw_value);
+		rf_write_wake_prog_syn(priv, priv->byRFType, ch->hw_value);
 
 	bb_software_reset(priv);
 
drivers/staging/vt6655/rf.c +2 -2
index 5246ba211ffb..569b430dd9ae 100644
@@ -676,8 +676,8 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
  * Return Value: None.
  *
  */
-bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type,
-			 u16 channel)
+bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type,
+			    u16 channel)
 {
 	void __iomem *iobase = priv->port_offset;
 	int i;
drivers/staging/vt6655/rf.h +1 -1
index 0939937d47a8..9fef81846a9f 100644
@@ -60,7 +60,7 @@
 bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData);
 bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType, u16 byChannel);
 bool RFbInit(struct vnt_private *priv);
-bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char rf_type, u16 channel);
+bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type, u16 channel);
 bool RFbSetPower(struct vnt_private *priv, unsigned int rate, u16 uCH);
 bool RFbRawSetPower(struct vnt_private *priv, unsigned char byPwr,
 		    unsigned int rate);
Signature · 1 line
2.30.2
#6 lore raw

PATCH v3 6/8 staging: vt6655: Update comment for `rf_write_wake_prog_syn`

In reply to Karolina Drobnik

Change the function description to include the actual parameters. Update the comment on the return type.

---
 drivers/staging/vt6655/rf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vt6655/rf.c +4 -4
index 569b430dd9ae..d4c18d9bfc67 100644
@@ -669,11 +669,11 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
  *
  * Parameters:
  *  In:
- *      iobase      - I/O base address
- *      channel     - channel number
- *      bySleepCnt  - SleepProgSyn count
+ *      priv        - Device Structure
+ *      rf_type     - RF type
+ *      channel     - Channel number
  *
- * Return Value: None.
+ * Return Value: true if succeeded; false if failed.
  *
  */
 bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type,
Signature · 1 line
2.30.2
#7 lore raw

PATCH v3 7/8 staging: vt6655: Delete bogus check for `init_count` in AL2230

In reply to Karolina Drobnik

Remove an unnecessary check in rf_write_wake_prog_syn in RF_AL2230S switch case. This if conditional will never be true as init_count is equal to 17 and can't be bigger than MISCFIFO_SYNDATASIZE - 0, which is equal to 21.

---
 drivers/staging/vt6655/rf.c | 2 --
 1 file changed, 2 deletions(-)
drivers/staging/vt6655/rf.c +0 -2
index d4c18d9bfc67..4bfadd85c82c 100644
@@ -697,8 +697,6 @@ bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type,
 		 /* Init Reg + Channel Reg (2) */
 		init_count = CB_AL2230_INIT_SEQ + 2;
 		sleep_count = 0;
-		if (init_count > (MISCFIFO_SYNDATASIZE - sleep_count))
-			return false;
 
 		for (i = 0; i < CB_AL2230_INIT_SEQ; i++)
 			MACvSetMISCFifo(priv, idx++, al2230_init_table[i]);
Signature · 1 line
2.30.2
#8 lore raw

PATCH v3 8/8 staging: vt6655: Delete bogus check for `init_count` in AL7230

In reply to Karolina Drobnik

Remove an unnecessary check in rf_write_wake_prog_syn in RF_AIROHA7230 switch case. This if conditional will never be true as init_count is equal to 18 and can't be bigger than MISCFIFO_SYNDATASIZE - 0, which is equal to 21.

---
 drivers/staging/vt6655/rf.c | 2 --
 1 file changed, 2 deletions(-)
drivers/staging/vt6655/rf.c +0 -2
index 4bfadd85c82c..8513fc565b1a 100644
@@ -710,8 +710,6 @@ bool rf_write_wake_prog_syn(struct vnt_private *priv, unsigned char rf_type,
 		 /* Init Reg + Channel Reg (3) */
 		init_count = CB_AL7230_INIT_SEQ + 3;
 		sleep_count = 0;
-		if (init_count > (MISCFIFO_SYNDATASIZE - sleep_count))
-			return false;
 
 		init_table = (channel <= CB_MAX_CHANNEL_24G) ?
 			al7230_init_table : al7230_init_table_a_mode;
Signature · 1 line
2.30.2
Reviewed-by on the v3 series
#9 lore raw
In reply to Karolina Drobnik
Quoted 2 lines · Karolina Drobnik

* merge two patches (using incrementation in idx and cleanup) into one, partially implementing Dan's suggestion

I don't know why you didn't implement my suggestions exactly as I described.... :/

If I were reading this patchset the first time through I would have NAKed it because patch 2 is done in the wrong way. In a way, it's my fault because I tried to explain exactly how the one thing per patch rule worked and I obviously was not clear.

Ah well... Let's just merge it and move on.

regards,
dan carpenter