Skip to contentSkip to conversation

staging: vt6655: Fix alignment, spacing and open-ended lines

PATCH Superseded Frank A. Cancio Bello 2 participants 6 messages Nov 1, 2019 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover staging: vt6655: Fix alignment, spacing and open-ended lines

This patchset fixes minor spacing, alignment, and open-ended lines. Three types of checkpatch.pl messages are addressed:
- CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
- CHECK:SPACING: spaces preferred around that
- CHECK:OPEN_ENDED_LINE: Lines should not end with a '('

Frank A. Cancio Bello (3):
staging: vt6655: Fix parameters alignment issues
staging: vt6655: Fix the spacing around operators
staging: vt6655: Fix open ended lines

 drivers/staging/vt6655/card.h        |  2 +-
 drivers/staging/vt6655/device_main.c | 14 ++++++++------
 drivers/staging/vt6655/power.c       | 10 ++--------
 drivers/staging/vt6655/rf.c          |  4 ++--
 drivers/staging/vt6655/rf.h          | 19 +++++--------------
 drivers/staging/vt6655/rxtx.c        |  5 +++--
 6 files changed, 21 insertions(+), 33 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 staging: vt6655: Fix parameters alignment issues

checkpatch message:
CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis

---
 drivers/staging/vt6655/card.h        | 2 +-
 drivers/staging/vt6655/device_main.c | 8 +++++---
 drivers/staging/vt6655/rxtx.c        | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/staging/vt6655/card.h +1 -1
index 887c1692e05b..25867cb9d13d 100644
@@ -45,7 +45,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type);
 void CARDvUpdateBasicTopRate(struct vnt_private *priv);
 bool CARDbIsOFDMinBasicRate(struct vnt_private *priv);
 void CARDvSetLoopbackMode(struct vnt_private *priv,
-			   unsigned short wLoopbackMode);
+			  unsigned short wLoopbackMode);
 bool CARDbSoftwareReset(struct vnt_private *priv);
 void CARDvSetFirstNextTBTT(struct vnt_private *priv,
 			   unsigned short wBeaconInterval);
drivers/staging/vt6655/device_main.c +5 -3
index 082302944c37..ab7b690c622d 100644
@@ -133,7 +133,8 @@ static int device_init_td1_ring(struct vnt_private *priv);
 static int  device_rx_srv(struct vnt_private *priv, unsigned int idx);
 static int  device_tx_srv(struct vnt_private *priv, unsigned int idx);
 static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rx_desc *);
-static void device_free_rx_buf(struct vnt_private *priv, struct vnt_rx_desc *rd);
+static void device_free_rx_buf(struct vnt_private *priv,
+			       struct vnt_rx_desc *rd);
 static void device_init_registers(struct vnt_private *priv);
 static void device_free_tx_buf(struct vnt_private *, struct vnt_tx_desc *);
 static void device_free_td0_ring(struct vnt_private *priv);
@@ -295,7 +296,8 @@ static void device_init_registers(struct vnt_private *priv)
 	/* Get Desire Power Value */
 	priv->byCurPwr = 0xFF;
 	priv->byCCKPwr = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_CCK);
-	priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_OFDMG);
+	priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset,
+					      EEP_OFS_PWR_OFDMG);
 
 	/* Load power Table */
 	for (ii = 0; ii < CB_MAX_CHANNEL_24G; ii++) {
@@ -373,7 +375,7 @@ static void device_init_registers(struct vnt_private *priv)
 	priv->bRadioOff = false;
 
 	priv->byRadioCtl = SROMbyReadEmbedded(priv->PortOffset,
-						 EEP_OFS_RADIOCTL);
+					      EEP_OFS_RADIOCTL);
 	priv->bHWRadioOff = false;
 
 	if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) {
drivers/staging/vt6655/rxtx.c +3 -2
index a14908895b9e..37fcc42ed000 100644
@@ -1289,7 +1289,7 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 
 	current_rate = rate->hw_value;
 	if (priv->wCurrentRate != current_rate &&
-			!(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
+	    !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
 		priv->wCurrentRate = current_rate;
 
 		RFbSetPower(priv, priv->wCurrentRate,
@@ -1396,7 +1396,8 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 		tx_key = info->control.hw_key;
 		if (tx_key->keylen > 0)
 			vnt_fill_txkey(hdr, tx_buffer_head->tx_key,
-				tx_key, skb, tx_body_size, td_info->mic_hdr);
+				       tx_key, skb, tx_body_size,
+				       td_info->mic_hdr);
 	}
 
 	return 0;
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/3 staging: vt6655: Fix the spacing around operators

In reply to Frank A. Cancio Bello

checkpatch message:
CHECK:SPACING: spaces preferred around that ...

---
 drivers/staging/vt6655/device_main.c | 6 +++---
 drivers/staging/vt6655/rf.c          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/vt6655/device_main.c +3 -3
index ab7b690c622d..f73446f379a9 100644
@@ -661,12 +661,12 @@ static int device_init_td0_ring(struct vnt_private *priv)
 		desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
 		desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
 
-		desc->next = &(priv->apTD0Rings[(i+1) % priv->opts.tx_descs[0]]);
+		desc->next = &(priv->apTD0Rings[(i + 1) % priv->opts.tx_descs[0]]);
 		desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
 	}
 
 	if (i > 0)
-		priv->apTD0Rings[i-1].next_desc = cpu_to_le32(priv->td0_pool_dma);
+		priv->apTD0Rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
 	priv->apTailTD[0] = priv->apCurrTD[0] = &priv->apTD0Rings[0];
 
 	return 0;
@@ -706,7 +706,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
 	}
 
 	if (i > 0)
-		priv->apTD1Rings[i-1].next_desc = cpu_to_le32(priv->td1_pool_dma);
+		priv->apTD1Rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
 	priv->apTailTD[1] = priv->apCurrTD[1] = &priv->apTD1Rings[0];
 
 	return 0;
drivers/staging/vt6655/rf.c +2 -2
index e80fed69bafe..7cbc5bc4aad2 100644
@@ -436,7 +436,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
 	ret &= IFRFbWriteEmbedded(priv, (0x3ABA8F00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW));
 	MACvTimer0MicroSDelay(priv, 30);/* 30us */
 	/* TXDCOC:disable, RCK:disable */
-	ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);
+	ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ - 1]);
 
 	MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
 							 SOFTPWRCTL_SWPE2    |
@@ -558,7 +558,7 @@ static bool RFbAL2230Init(struct vnt_private *priv)
 	MACvTimer0MicroSDelay(priv, 30);/* 30us */
 	ret &= IFRFbWriteEmbedded(priv, (0x00780f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
 	MACvTimer0MicroSDelay(priv, 30);/* 30us */
-	ret &= IFRFbWriteEmbedded(priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);
+	ret &= IFRFbWriteEmbedded(priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ - 1]);
 
 	MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
 							 SOFTPWRCTL_SWPE2    |
Signature · 1 line
2.17.1
#4 lore raw

PATCH 3/3 staging: vt6655: Fix open ended lines

In reply to Frank A. Cancio Bello

checkpatch message:
CHECK:OPEN_ENDED_LINE: Lines should not end with a '('

---
 drivers/staging/vt6655/power.c | 10 ++--------
 drivers/staging/vt6655/rf.h    | 19 +++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)
drivers/staging/vt6655/power.c +2 -8
index 9725de3bca6a..bfd598a93b04 100644
@@ -97,10 +97,7 @@ void PSvEnablePowerSaving(struct vnt_private *priv,
  *
  */
 
-void
-PSvDisablePowerSaving(
-	struct vnt_private *priv
-)
+void PSvDisablePowerSaving(struct vnt_private *priv)
 {
 	/* disable power saving hw function */
 	MACbPSWakeup(priv);
@@ -126,10 +123,7 @@ PSvDisablePowerSaving(
  *
  */
 
-bool
-PSbIsNextTBTTWakeUp(
-	struct vnt_private *priv
-)
+bool PSbIsNextTBTTWakeUp(struct vnt_private *priv)
 {
 	struct ieee80211_hw *hw = priv->hw;
 	struct ieee80211_conf *conf = &hw->conf;
drivers/staging/vt6655/rf.h +5 -14
index 042ac67a9709..affb70eba10f 100644
@@ -61,23 +61,14 @@
 
 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 RFbInit(struct vnt_private *priv);
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType, u16 uChannel);
 bool RFbSetPower(struct vnt_private *priv, unsigned int rate, u16 uCH);
-bool RFbRawSetPower(
-	struct vnt_private *priv,
-	unsigned char byPwr,
-	unsigned int rate
-);
+bool RFbRawSetPower(struct vnt_private *priv, unsigned char byPwr,
+		    unsigned int rate);
 
-void
-RFvRSSITodBm(
-	struct vnt_private *priv,
-	unsigned char byCurrRSSI,
-	long    *pldBm
-);
+void RFvRSSITodBm(struct vnt_private *priv, unsigned char byCurrRSSI,
+		  long *pldBm);
 
 /* {{ RobertYu: 20050104 */
 bool RFbAL7230SelectChannelPostProcess(struct vnt_private *priv, u16 byOldChannel, u16 byNewChannel);
Signature · 1 line
2.17.1
#2 lore raw

Re: [Outreachy kernel] [PATCH 1/3] staging: vt6655: Fix parameters alignment issues

In reply to Frank A. Cancio Bello
Quoted 38 lines · Frank A. Cancio Bello

checkpatch message:
CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis

---
 drivers/staging/vt6655/card.h        | 2 +-
 drivers/staging/vt6655/device_main.c | 8 +++++---
 drivers/staging/vt6655/rxtx.c        | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/staging/vt6655/card.h +1 -1
index 887c1692e05b..25867cb9d13d 100644
@@ -45,7 +45,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type);
 void CARDvUpdateBasicTopRate(struct vnt_private *priv);
 bool CARDbIsOFDMinBasicRate(struct vnt_private *priv);
 void CARDvSetLoopbackMode(struct vnt_private *priv,
-			   unsigned short wLoopbackMode);
+			  unsigned short wLoopbackMode);
 bool CARDbSoftwareReset(struct vnt_private *priv);
 void CARDvSetFirstNextTBTT(struct vnt_private *priv,
 			   unsigned short wBeaconInterval);
drivers/staging/vt6655/device_main.c +2 -1
index 082302944c37..ab7b690c622d 100644
@@ -133,7 +133,8 @@ static int device_init_td1_ring(struct vnt_private *priv);
 static int  device_rx_srv(struct vnt_private *priv, unsigned int idx);
 static int  device_tx_srv(struct vnt_private *priv, unsigned int idx);
 static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rx_desc *);
-static void device_free_rx_buf(struct vnt_private *priv, struct vnt_rx_desc *rd);
+static void device_free_rx_buf(struct vnt_private *priv,
+			       struct vnt_rx_desc *rd);
 static void device_init_registers(struct vnt_private *priv);
 static void device_free_tx_buf(struct vnt_private *, struct vnt_tx_desc *);
 static void device_free_td0_ring(struct vnt_private *priv);

drivers/staging/vt6655/device_main.c static void device_init_registers(struct vnt_private *priv) · line 300

Quoted 6 lines
drivers/staging/vt6655/device_main.c +2 -1
@@ -295,7 +296,8 @@ static void device_init_registers(struct vnt_private *priv)
 	/* Get Desire Power Value */
 	priv->byCurPwr = 0xFF;
 	priv->byCCKPwr = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_CCK);
-	priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_PWR_OFDMG);
+	priv->byOFDMPwrG = SROMbyReadEmbedded(priv->PortOffset,
+					      EEP_OFS_PWR_OFDMG);

The change here seems to be an 80 column issue, not what was mentioned in the commit log.

julia

Quoted 43 lines
drivers/staging/vt6655/device_main.c +1 -1
 	/* Load power Table */
 	for (ii = 0; ii < CB_MAX_CHANNEL_24G; ii++) {
@@ -373,7 +375,7 @@ static void device_init_registers(struct vnt_private *priv)
 	priv->bRadioOff = false;
 
 	priv->byRadioCtl = SROMbyReadEmbedded(priv->PortOffset,
-						 EEP_OFS_RADIOCTL);
+					      EEP_OFS_RADIOCTL);
 	priv->bHWRadioOff = false;
 
 	if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) {
drivers/staging/vt6655/rxtx.c +3 -3
index a14908895b9e..37fcc42ed000 100644
@@ -1289,7 +1289,7 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 
 	current_rate = rate->hw_value;
 	if (priv->wCurrentRate != current_rate &&
-			!(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
+	    !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
 		priv->wCurrentRate = current_rate;
 
 		RFbSetPower(priv, priv->wCurrentRate,
@@ -1396,7 +1396,8 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 		tx_key = info->control.hw_key;
 		if (tx_key->keylen > 0)
 			vnt_fill_txkey(hdr, tx_buffer_head->tx_key,
-				tx_key, skb, tx_body_size, td_info->mic_hdr);
+				       tx_key, skb, tx_body_size,
+				       td_info->mic_hdr);
 	}
 
 	return 0;
--

2.17.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/5a5fc17ab55b41928df8c6097ca57ad4ae4fbfed.1572581578.git.frank%40generalsoftwareinc.com.

#5 lore raw
In reply to Frank A. Cancio Bello
Quoted 5 lines · Frank A. Cancio Bello

This patchset fixes minor spacing, alignment, and open-ended lines. Three types of checkpatch.pl messages are addressed:
- CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
- CHECK:SPACING: spaces preferred around that
- CHECK:OPEN_ENDED_LINE: Lines should not end with a '('

Please improve the log messages on all of these patches. Avoid the word "Fix", which doesn't give any information about what you did. Don't include the checkpatch messages. Don't use ... in the SPACING case - all of the information about what is going on is in the ..., which the reader has to guess about.

julia

Quoted 22 lines

Frank A. Cancio Bello (3):
staging: vt6655: Fix parameters alignment issues
staging: vt6655: Fix the spacing around operators
staging: vt6655: Fix open ended lines

 drivers/staging/vt6655/card.h        |  2 +-
 drivers/staging/vt6655/device_main.c | 14 ++++++++------
 drivers/staging/vt6655/power.c       | 10 ++--------
 drivers/staging/vt6655/rf.c          |  4 ++--
 drivers/staging/vt6655/rf.h          | 19 +++++--------------
 drivers/staging/vt6655/rxtx.c        |  5 +++--
 6 files changed, 21 insertions(+), 33 deletions(-)

--
2.17.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/cover.1572581578.git.frank%40generalsoftwareinc.com.