staging: vt6655: Code style cleanup
v2 cover staging: vt6655: Code style cleanup
Code style issues like wrong spacing, long lines, open ended parameter and alignment make the code harder to read. This patchset improves the code to comply with the preferred coding style for the linux kernel. Issues found by checkpatch.
Changes in v2 by Julia Lawall suggestion:
- Improves log messages on all of the patches.
- Remove the checkpatch messages.
- Long line issues are in its own patch.
Frank A. Cancio Bello (4):
staging: vt6655: Fix parameter alignment issues
staging: vt6655: Fix the spacing around operators
staging: vt6655: Fix open ended lines
staging: vt6655: Fix long 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 | 5 +++-- drivers/staging/vt6655/rf.h | 19 +++++-------------- drivers/staging/vt6655/rxtx.c | 5 +++-- 6 files changed, 22 insertions(+), 33 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 staging: vt6655: Fix parameter alignment issues
Fix alignment to match open parenthesis and comply in that way with the preferred coding style for the linux kernel. Issue found by checkpatch.
--- drivers/staging/vt6655/card.h | 2 +- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/rxtx.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/staging/vt6655/card.h +1 -1
@@ -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 +1 -1
@@ -373,7 +373,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
@@ -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
PATCH v2 2/4 staging: vt6655: Fix the spacing around operators
In reply to Frank A. Cancio BelloAdd space around operators to comply in that way with the preferred coding style for the linux kernel. Issue found by checkpatch.
--- 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
@@ -659,12 +659,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 ;
@@ -704,7 +704,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
@@ -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
PATCH v2 3/4 staging: vt6655: Fix open ended lines
In reply to Frank A. Cancio BelloThis commit arrange function declaration in one line to avoid lines ending with '(' and comply in that way with the preferred coding style for the linux kernel.
--- 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
@@ -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
@@ -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
PATCH v2 4/4 staging: vt6655: Fix long lines
In reply to Frank A. Cancio BelloLines longer than 80 characters should be avoided because they are ugly and harder to read. Fix a few of long lines to comply with the preferred coding style for the linux kernel. Issues found by checkpatch.
--- drivers/staging/vt6655/device_main.c | 6 ++++-- drivers/staging/vt6655/rf.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/staging/vt6655/device_main.c +4 -2
@@ -295,7 +295,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++) {
@@ -660,7 +661,8 @@ static int device_init_td0_ring(struct vnt_private *priv) 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_desc =cpu_to_le32 (curr +sizeof (struct vnt_tx_desc )); + desc->next_desc =cpu_to_le32 (curr + +sizeof (struct vnt_tx_desc )); }if (i >0 )
drivers/staging/vt6655/rf.c +2 -1
@@ -558,7 +558,8 @@ 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