* [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c
@ 2022-10-21 10:33 Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 1/6] staging: vt6655: fix lines ending in a '(' Tanjuate Brunostar
` (5 more replies)
0 siblings, 6 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
The fixes are similar, mostly long lines splitting. I had to make
serveral patches to ease the work of inspectors
v2: fixed a compilation error found by the kernel test robot and
recompiled the code
Tanjuate Brunostar (6):
staging: vt6655: fix lines ending in a '('
staging: vt6655: refactor long lines of code in s_uGetRTSCTSDuration
staging: vt6655: refactor long lines of code in s_uFillDataHead
staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
staging: vt6655: refactor long lines of code in the rest of the file
staging: vt6655: refactor code to avoid a line ending in '('
drivers/staging/vt6655/rxtx.c | 535 ++++++++++++++++++++--------------
1 file changed, 323 insertions(+), 212 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 1/6] staging: vt6655: fix lines ending in a '('
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 2/6] staging: vt6655: refactor long lines of code in s_uGetRTSCTSDuration Tanjuate Brunostar
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
fix serveral checkpatch errors related to lines ending with a '(' by
refactoring the code lines
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 149 ++++++++++++++--------------------
1 file changed, 63 insertions(+), 86 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 1e5036121665..f9d0b00d7cff 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -141,13 +141,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
*/
static
unsigned int
-s_uGetTxRsvTime(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- unsigned int cbFrameLength,
- unsigned short wRate,
- bool bNeedAck
-)
+s_uGetTxRsvTime(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ unsigned int cbFrameLength,
+ unsigned short wRate,
+ bool bNeedAck)
{
unsigned int uDataTime, uAckTime;
@@ -215,19 +213,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
/* byFreqType 0: 5GHz, 1:2.4Ghz */
static
-unsigned int
-s_uGetDataDuration(
- struct vnt_private *pDevice,
- unsigned char byDurType,
- unsigned int cbFrameLength,
- unsigned char byPktType,
- unsigned short wRate,
- bool bNeedAck,
- unsigned int uFragIdx,
- unsigned int cbLastFragmentSize,
- unsigned int uMACfragNum,
- unsigned char byFBOption
-)
+unsigned int s_uGetDataDuration(struct vnt_private *pDevice,
+ unsigned char byDurType,
+ unsigned int cbFrameLength,
+ unsigned char byPktType,
+ unsigned short wRate,
+ bool bNeedAck,
+ unsigned int uFragIdx,
+ unsigned int cbLastFragmentSize,
+ unsigned int uMACfragNum,
+ unsigned char byFBOption)
{
bool bLastFrag = false;
unsigned int uAckTime = 0, uNextPktTime = 0, len;
@@ -316,17 +311,13 @@ s_uGetDataDuration(
}
/* byFreqType: 0=>5GHZ 1=>2.4GHZ */
-static
-__le16
-s_uGetRTSCTSDuration(
- struct vnt_private *pDevice,
- unsigned char byDurType,
- unsigned int cbFrameLength,
- unsigned char byPktType,
- unsigned short wRate,
- bool bNeedAck,
- unsigned char byFBOption
-)
+static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
+ unsigned char byDurType,
+ unsigned int cbFrameLength,
+ unsigned char byPktType,
+ unsigned short wRate,
+ bool bNeedAck,
+ unsigned char byFBOption)
{
unsigned int uCTSTime = 0, uDurTime = 0;
@@ -409,22 +400,18 @@ s_uGetRTSCTSDuration(
return cpu_to_le16((u16)uDurTime);
}
-static
-__le16
-s_uFillDataHead(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- void *pTxDataHead,
- unsigned int cbFrameLength,
- unsigned int uDMAIdx,
- bool bNeedAck,
- unsigned int uFragIdx,
- unsigned int cbLastFragmentSize,
- unsigned int uMACfragNum,
- unsigned char byFBOption,
- unsigned short wCurrentRate,
- bool is_pspoll
-)
+static __le16 s_uFillDataHead(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ void *pTxDataHead,
+ unsigned int cbFrameLength,
+ unsigned int uDMAIdx,
+ bool bNeedAck,
+ unsigned int uFragIdx,
+ unsigned int cbLastFragmentSize,
+ unsigned int uMACfragNum,
+ unsigned char byFBOption,
+ unsigned short wCurrentRate,
+ bool is_pspoll)
{
struct vnt_tx_datahead_ab *buf = pTxDataHead;
@@ -555,19 +542,15 @@ s_uFillDataHead(
return buf->duration;
}
-static
-void
-s_vFillRTSHead(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- void *pvRTS,
- unsigned int cbFrameLength,
- bool bNeedAck,
- bool bDisCRC,
- struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
- unsigned char byFBOption
-)
+static void s_vFillRTSHead(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ void *pvRTS,
+ unsigned int cbFrameLength,
+ bool bNeedAck,
+ bool bDisCRC,
+ struct ieee80211_hdr *hdr,
+ unsigned short wCurrentRate,
+ unsigned char byFBOption)
{
unsigned int uRTSFrameLen = 20;
@@ -752,17 +735,15 @@ s_vFillRTSHead(
static
void
-s_vFillCTSHead(
- struct vnt_private *pDevice,
- unsigned int uDMAIdx,
- unsigned char byPktType,
- void *pvCTS,
- unsigned int cbFrameLength,
- bool bNeedAck,
- bool bDisCRC,
- unsigned short wCurrentRate,
- unsigned char byFBOption
-)
+s_vFillCTSHead(struct vnt_private *pDevice,
+ unsigned int uDMAIdx,
+ unsigned char byPktType,
+ void *pvCTS,
+ unsigned int cbFrameLength,
+ bool bNeedAck,
+ bool bDisCRC,
+ unsigned short wCurrentRate,
+ unsigned char byFBOption)
{
unsigned int uCTSFrameLen = 14;
@@ -868,21 +849,17 @@ s_vFillCTSHead(
-
* unsigned int cbFrameSize, Hdr+Payload+FCS
*/
-static
-void
-s_vGenerateTxParameter(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- struct vnt_tx_fifo_head *tx_buffer_head,
- void *pvRrvTime,
- void *pvRTS,
- void *pvCTS,
- unsigned int cbFrameSize,
- bool bNeedACK,
- unsigned int uDMAIdx,
- void *psEthHeader,
- unsigned short wCurrentRate
-)
+static void s_vGenerateTxParameter(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ struct vnt_tx_fifo_head *tx_buffer_head,
+ void *pvRrvTime,
+ void *pvRTS,
+ void *pvCTS,
+ unsigned int cbFrameSize,
+ bool bNeedACK,
+ unsigned int uDMAIdx,
+ void *psEthHeader,
+ unsigned short wCurrentRate)
{
u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
bool bDisCRC = false;
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/6] staging: vt6655: refactor long lines of code in s_uGetRTSCTSDuration
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 1/6] staging: vt6655: fix lines ending in a '(' Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead Tanjuate Brunostar
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
fix checkpatch errors by refactoring long lines of code in the function: s_uGetRTSCTSDuration
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 108 ++++++++++++++++++++++++----------
1 file changed, 76 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index f9d0b00d7cff..01e72999831b 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -188,20 +188,29 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
data_time = bb_get_frame_time(priv->preamble_type, pkt_type, frame_length, current_rate);
if (rts_rsvtype == 0) { /* RTSTxRrvTime_bb */
- rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopCCKBasicRate);
- ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
+ rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20,
+ priv->byTopCCKBasicRate);
+ ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopCCKBasicRate);
cts_time = ack_time;
} else if (rts_rsvtype == 1) { /* RTSTxRrvTime_ba, only in 2.4GHZ */
- rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopCCKBasicRate);
- cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
- ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
+ rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20,
+ priv->byTopCCKBasicRate);
+ cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopCCKBasicRate);
+ ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopOFDMBasicRate);
} else if (rts_rsvtype == 2) { /* RTSTxRrvTime_aa */
- rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20, priv->byTopOFDMBasicRate);
- ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
+ rts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 20,
+ priv->byTopOFDMBasicRate);
+ ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopOFDMBasicRate);
cts_time = ack_time;
} else if (rts_rsvtype == 3) { /* CTSTxRrvTime_ba, only in 2.4GHZ */
- cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopCCKBasicRate);
- ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14, priv->byTopOFDMBasicRate);
+ cts_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopCCKBasicRate);
+ ack_time = bb_get_frame_time(priv->preamble_type, pkt_type, 14,
+ priv->byTopOFDMBasicRate);
rrv_time = cts_time + ack_time + data_time + 2 * priv->uSIFS;
return cpu_to_le16((u16)rrv_time);
}
@@ -323,73 +332,108 @@ static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
switch (byDurType) {
case RTSDUR_BB: /* RTSDuration_bb */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopCCKBasicRate);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break;
case RTSDUR_BA: /* RTSDuration_ba */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopCCKBasicRate);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break;
case RTSDUR_AA: /* RTSDuration_aa */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopOFDMBasicRate);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
break;
case CTSDUR_BA: /* CTSDuration_ba */
- uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wRate, bNeedAck);
+ uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType,
+ cbFrameLength, wRate, bNeedAck);
break;
case RTSDUR_BA_F0: /* RTSDuration_ba_f0 */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopCCKBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
break;
case RTSDUR_AA_F0: /* RTSDuration_aa_f0 */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopOFDMBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
break;
case RTSDUR_BA_F1: /* RTSDuration_ba_f1 */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopCCKBasicRate);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopCCKBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
break;
case RTSDUR_AA_F1: /* RTSDuration_aa_f1 */
- uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14, pDevice->byTopOFDMBasicRate);
+ uCTSTime = bb_get_frame_time(pDevice->preamble_type, byPktType, 14,
+ pDevice->byTopOFDMBasicRate);
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = uCTSTime + 2 * pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = uCTSTime + 2 * pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
break;
case CTSDUR_BA_F0: /* CTSDuration_ba_f0 */
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE0][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
+ uDurTime = pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE0][wRate - RATE_18M], bNeedAck);
break;
case CTSDUR_BA_F1: /* CTSDuration_ba_f1 */
if ((byFBOption == AUTO_FB_0) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt0[FB_RATE1][wRate - RATE_18M], bNeedAck);
else if ((byFBOption == AUTO_FB_1) && (wRate >= RATE_18M) && (wRate <= RATE_54M))
- uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength, wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
+ uDurTime = pDevice->uSIFS +
+ s_uGetTxRsvTime(pDevice, byPktType, cbFrameLength,
+ wFB_Opt1[FB_RATE1][wRate - RATE_18M], bNeedAck);
break;
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 1/6] staging: vt6655: fix lines ending in a '(' Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 2/6] staging: vt6655: refactor long lines of code in s_uGetRTSCTSDuration Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter Tanjuate Brunostar
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
fix checkpatch errors by refactoring long lines of code in the function: s_uFillDataHead
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 97 ++++++++++++++++++++++++-----------
1 file changed, 67 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 01e72999831b..dc853b83459b 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -484,19 +484,28 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice,
} else {
/* Get Duration and TimeStamp */
buf->duration_a =
- cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength,
- byPktType, wCurrentRate, bNeedAck, uFragIdx,
- cbLastFragmentSize, uMACfragNum,
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A,
+ cbFrameLength,
+ byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx,
+ cbLastFragmentSize,
+ uMACfragNum,
byFBOption));
buf->duration_b =
- cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength,
- PK_TYPE_11B, pDevice->byTopCCKBasicRate,
- bNeedAck, uFragIdx, cbLastFragmentSize,
- uMACfragNum, byFBOption));
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B,
+ cbFrameLength,
+ PK_TYPE_11B,
+ pDevice->byTopCCKBasicRate,
+ bNeedAck, uFragIdx,
+ cbLastFragmentSize,
+ uMACfragNum,
+ byFBOption));
}
buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate);
- buf->time_stamp_off_b = vnt_time_stamp_off(pDevice, pDevice->byTopCCKBasicRate);
+ buf->time_stamp_off_b = vnt_time_stamp_off(pDevice,
+ pDevice->byTopCCKBasicRate);
return buf->duration_a;
}
@@ -509,14 +518,29 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice,
pDevice->byTopCCKBasicRate,
PK_TYPE_11B, &buf->b);
/* Get Duration and TimeStamp */
- buf->duration_a = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
- buf->duration_b = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B,
- pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
- buf->duration_a_f0 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
- buf->duration_a_f1 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
+ buf->duration_a = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
+ buf->duration_b = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B,
+ cbFrameLength, PK_TYPE_11B,
+ pDevice->byTopCCKBasicRate,
+ bNeedAck, uFragIdx,
+ cbLastFragmentSize,
+ uMACfragNum, byFBOption));
+ buf->duration_a_f0 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx,
+ cbLastFragmentSize,
+ uMACfragNum, byFBOption));
+ buf->duration_a_f1 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx,
+ cbLastFragmentSize,
+ uMACfragNum, byFBOption));
buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate);
buf->time_stamp_off_b = vnt_time_stamp_off(pDevice, pDevice->byTopCCKBasicRate);
@@ -534,12 +558,24 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice,
byPktType, &buf->a);
/* Get Duration and TimeStampOff */
- buf->duration = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
- buf->duration_f0 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
- buf->duration_f1 = cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption));
+ buf->duration =
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
+ buf->duration_f0 =
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F0,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
+ buf->duration_f1 =
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A_F1,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
return buf->duration;
}
@@ -555,10 +591,11 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice,
} else {
/* Get Duration and TimeStampOff */
buf->duration =
- cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx,
- cbLastFragmentSize, uMACfragNum,
- byFBOption));
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A,
+ cbFrameLength, byPktType,
+ wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
}
buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
@@ -576,10 +613,10 @@ static __le16 s_uFillDataHead(struct vnt_private *pDevice,
} else {
/* Get Duration and TimeStampOff */
buf->duration =
- cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType,
- wCurrentRate, bNeedAck, uFragIdx,
- cbLastFragmentSize, uMACfragNum,
- byFBOption));
+ cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength,
+ byPktType, wCurrentRate, bNeedAck,
+ uFragIdx, cbLastFragmentSize,
+ uMACfragNum, byFBOption));
}
buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
` (2 preceding siblings ...)
2022-10-21 10:33 ` [PATCH v2 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
2022-10-21 16:52 ` Philipp Hortmann
2022-10-21 10:33 ` [PATCH v2 5/6] staging: vt6655: refactor long lines of code in the rest of the file Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 6/6] staging: vt6655: refactor code to avoid a line ending in '(' Tanjuate Brunostar
5 siblings, 1 reply; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++-----------
1 file changed, 48 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index dc853b83459b..42f4261293ba 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice,
}
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
- if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
+ if (byFBOption != AUTO_FB_NONE && uDMAIdx !=
+ TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
/* Auto Fall back */
struct vnt_cts_fb *buf = pvCTS;
/* Get SignalField, ServiceField & Length */
@@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice,
ether_addr_copy(buf->data.ra,
pDevice->abyCurrentNetAddr);
- } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */
+ } else {
+ /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA &&
+ * uDMAIdx != TYPE_BEACONDMA)
+ */
struct vnt_cts *buf = pvCTS;
/* Get SignalField, ServiceField & Length */
vnt_get_phy_field(pDevice, uCTSFrameLen,
@@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
/* Fill RsvTime */
struct vnt_rrv_time_rts *buf = pvRrvTime;
- buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
- buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate);
- buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
- buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
- buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
-
- s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+ buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
+ wCurrentRate);
+ buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize,
+ wCurrentRate);
+ buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
+ wCurrentRate);
+ buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
+ wCurrentRate, bNeedACK);
+ buf->rrv_time_b =
+ vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
+ pDevice->byTopCCKBasicRate, bNeedACK);
+
+ s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
+ psEthHeader, wCurrentRate, byFBOption);
} else {/* RTS_needless, PCF mode */
struct vnt_rrv_time_cts *buf = pvRrvTime;
- buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
- buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
- buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate);
+ buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
+ wCurrentRate, bNeedACK);
+ buf->rrv_time_b =
+ vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
+ pDevice->byTopCCKBasicRate, bNeedACK);
+ buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize,
+ wCurrentRate);
/* Fill CTS */
- s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption);
+ s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK,
+ bDisCRC, wCurrentRate, byFBOption);
}
} else if (byPktType == PK_TYPE_11A) {
if (pvRTS) {/* RTS_need, non PCF mode */
- struct vnt_rrv_time_ab *buf = pvRrvTime;
+ struct vnt_rrv_time_ab *buf = pvRrvT
+ ime;
- buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
- buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
+ buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
+ wCurrentRate);
+ buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
+ wCurrentRate, bNeedACK);
/* Fill RTS */
- s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+ s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
+ psEthHeader, wCurrentRate, byFBOption);
} else if (!pvRTS) {/* RTS_needless, non PCF mode */
struct vnt_rrv_time_ab *buf = pvRrvTime;
- buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK);
+ buf->rrv_time =
+ vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize,
+ wCurrentRate, bNeedACK);
}
} else if (byPktType == PK_TYPE_11B) {
if (pvRTS) {/* RTS_need, non PCF mode */
struct vnt_rrv_time_ab *buf = pvRrvTime;
- buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
- buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
+ buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
+ wCurrentRate);
+ buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
+ wCurrentRate, bNeedACK);
/* Fill RTS */
- s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
+ s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
+ psEthHeader, wCurrentRate, byFBOption);
} else { /* RTS_needless, non PCF mode */
struct vnt_rrv_time_ab *buf = pvRrvTime;
- buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
+ buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
+ wCurrentRate, bNeedACK);
}
}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 5/6] staging: vt6655: refactor long lines of code in the rest of the file
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
` (3 preceding siblings ...)
2022-10-21 10:33 ` [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 6/6] staging: vt6655: refactor code to avoid a line ending in '(' Tanjuate Brunostar
5 siblings, 0 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
fix checkpatch errors by refactoring long lines of code in the rest of
the file
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 105 ++++++++++++++++++++++------------
1 file changed, 67 insertions(+), 38 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 42f4261293ba..b8b21cd39534 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1106,44 +1106,60 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
if (byFBOption == AUTO_FB_NONE) {
if (bRTS) {/* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts));
- pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts));
+ pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
pvCTS = NULL;
- pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) +
- cbMICHDR + sizeof(struct vnt_rts_g));
- cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_rts) +
- cbMICHDR + sizeof(struct vnt_rts_g) +
- sizeof(struct vnt_tx_datahead_g);
+ pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts) +
+ cbMICHDR + sizeof(struct vnt_rts_g));
+ cbHeaderLength =
+ wTxBufSize + sizeof(struct vnt_rrv_time_rts) +
+ cbMICHDR + sizeof(struct vnt_rts_g) +
+ sizeof(struct vnt_tx_datahead_g);
} else { /* RTS_needless */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts));
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_cts));
pvRTS = NULL;
- pvCTS = (void *) (pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
+ pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
- sizeof(struct vnt_rrv_time_cts) + cbMICHDR + sizeof(struct vnt_cts));
+ sizeof(struct vnt_rrv_time_cts) +
+ cbMICHDR + sizeof(struct vnt_cts));
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
- cbMICHDR + sizeof(struct vnt_cts) + sizeof(struct vnt_tx_datahead_g);
+ cbMICHDR + sizeof(struct vnt_cts) +
+ sizeof(struct vnt_tx_datahead_g);
}
} else {
/* Auto Fall Back */
if (bRTS) {/* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts));
- pvRTS = (void *) (pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts));
+ pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
pvCTS = NULL;
- pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) +
+ pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_rts) +
cbMICHDR + sizeof(struct vnt_rts_g_fb));
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_rts) +
- cbMICHDR + sizeof(struct vnt_rts_g_fb) + sizeof(struct vnt_tx_datahead_g_fb);
+ cbMICHDR + sizeof(struct vnt_rts_g_fb) +
+ sizeof(struct vnt_tx_datahead_g_fb);
} else { /* RTS_needless */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts));
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_cts));
pvRTS = NULL;
- pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
- pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
- cbMICHDR + sizeof(struct vnt_cts_fb));
+ pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
+ pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_cts) +
+ cbMICHDR + sizeof(struct vnt_cts_fb));
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +
- cbMICHDR + sizeof(struct vnt_cts_fb) + sizeof(struct vnt_tx_datahead_g_fb);
+ cbMICHDR + sizeof(struct vnt_cts_fb) +
+ sizeof(struct vnt_tx_datahead_g_fb);
}
} /* Auto Fall Back */
} else {/* 802.11a/b packet */
@@ -1151,19 +1167,25 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
if (byFBOption == AUTO_FB_NONE) {
if (bRTS) {
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
- pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab));
+ pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
pvCTS = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
- sizeof(struct vnt_rrv_time_ab) + cbMICHDR + sizeof(struct vnt_rts_ab));
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR +
+ sizeof(struct vnt_rts_ab));
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
- cbMICHDR + sizeof(struct vnt_rts_ab) + sizeof(struct vnt_tx_datahead_ab);
+ cbMICHDR + sizeof(struct vnt_rts_ab) +
+ sizeof(struct vnt_tx_datahead_ab);
} else { /* RTS_needless, need MICHDR */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab));
pvRTS = NULL;
pvCTS = NULL;
- pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
+ pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
cbMICHDR + sizeof(struct vnt_tx_datahead_ab);
}
@@ -1171,19 +1193,25 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
/* Auto Fall Back */
if (bRTS) { /* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
- pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab));
+ pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
pvCTS = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
- sizeof(struct vnt_rrv_time_ab) + cbMICHDR + sizeof(struct vnt_rts_a_fb));
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR +
+ sizeof(struct vnt_rts_a_fb));
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
- cbMICHDR + sizeof(struct vnt_rts_a_fb) + sizeof(struct vnt_tx_datahead_a_fb);
+ cbMICHDR + sizeof(struct vnt_rts_a_fb) +
+ sizeof(struct vnt_tx_datahead_a_fb);
} else { /* RTS_needless */
pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
- pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
+ pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab));
pvRTS = NULL;
pvCTS = NULL;
- pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
+ pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
+ sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
cbMICHDR + sizeof(struct vnt_tx_datahead_a_fb);
}
@@ -1198,8 +1226,9 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
s_vGenerateTxParameter(pDevice, byPktType, tx_buffer_head, pvRrvTime, pvRTS, pvCTS,
cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);
/* Fill DataHead */
- uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
- 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate, is_pspoll);
+ uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize,
+ uDMAIdx, bNeedACK, 0, 0, uMACfragNum, byFBOption,
+ pDevice->wCurrentRate, is_pspoll);
hdr->duration_id = uDuration;
@@ -1447,8 +1476,8 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
/* Get Duration and TimeStampOff */
short_head->duration =
cpu_to_le16((u16)s_uGetDataDuration(priv, DATADUR_B,
- frame_size, PK_TYPE_11A, current_rate,
- false, 0, 0, 1, AUTO_FB_NONE));
+ frame_size, PK_TYPE_11A, current_rate,
+ false, 0, 0, 1, AUTO_FB_NONE));
short_head->time_stamp_off =
vnt_time_stamp_off(priv, current_rate);
@@ -1463,8 +1492,8 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
/* Get Duration and TimeStampOff */
short_head->duration =
cpu_to_le16((u16)s_uGetDataDuration(priv, DATADUR_B,
- frame_size, PK_TYPE_11B, current_rate,
- false, 0, 0, 1, AUTO_FB_NONE));
+ frame_size, PK_TYPE_11B, current_rate,
+ false, 0, 0, 1, AUTO_FB_NONE));
short_head->time_stamp_off =
vnt_time_stamp_off(priv, current_rate);
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 6/6] staging: vt6655: refactor code to avoid a line ending in '('
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
` (4 preceding siblings ...)
2022-10-21 10:33 ` [PATCH v2 5/6] staging: vt6655: refactor long lines of code in the rest of the file Tanjuate Brunostar
@ 2022-10-21 10:33 ` Tanjuate Brunostar
5 siblings, 0 replies; 12+ messages in thread
From: Tanjuate Brunostar @ 2022-10-21 10:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, outreachy, Tanjuate Brunostar
join unnecessary split lines to avoid them ending in '('
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index b8b21cd39534..d997002ee9ff 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1301,10 +1301,8 @@ static void vnt_fill_txkey(struct ieee80211_hdr *hdr, u8 *key_buffer,
ether_addr_copy(mic_hdr->addr2, hdr->addr2);
ether_addr_copy(mic_hdr->addr3, hdr->addr3);
- mic_hdr->frame_control = cpu_to_le16(
- le16_to_cpu(hdr->frame_control) & 0xc78f);
- mic_hdr->seq_ctrl = cpu_to_le16(
- le16_to_cpu(hdr->seq_ctrl) & 0xf);
+ mic_hdr->frame_control = cpu_to_le16(le16_to_cpu(hdr->frame_control) & 0xc78f);
+ mic_hdr->seq_ctrl = cpu_to_le16(le16_to_cpu(hdr->seq_ctrl) & 0xf);
if (ieee80211_has_a4(hdr->frame_control))
ether_addr_copy(mic_hdr->addr4, hdr->addr4);
--
2.34.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-21 10:33 ` [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter Tanjuate Brunostar
@ 2022-10-21 16:52 ` Philipp Hortmann
2022-10-21 18:08 ` Tanju Brunostar
0 siblings, 1 reply; 12+ messages in thread
From: Philipp Hortmann @ 2022-10-21 16:52 UTC (permalink / raw)
To: Tanjuate Brunostar, gregkh; +Cc: linux-staging, linux-kernel, outreachy
On 10/21/22 12:33, Tanjuate Brunostar wrote:
> fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
>
> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> ---
> drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++-----------
> 1 file changed, 48 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index dc853b83459b..42f4261293ba 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice,
> }
>
> if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
> - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> + if (byFBOption != AUTO_FB_NONE && uDMAIdx !=
> + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> /* Auto Fall back */
> struct vnt_cts_fb *buf = pvCTS;
> /* Get SignalField, ServiceField & Length */
> @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice,
>
> ether_addr_copy(buf->data.ra,
> pDevice->abyCurrentNetAddr);
> - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */
> + } else {
> + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA &&
> + * uDMAIdx != TYPE_BEACONDMA)
> + */
> struct vnt_cts *buf = pvCTS;
> /* Get SignalField, ServiceField & Length */
> vnt_get_phy_field(pDevice, uCTSFrameLen,
> @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> /* Fill RsvTime */
> struct vnt_rrv_time_rts *buf = pvRrvTime;
>
> - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate);
> - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> -
> - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> + wCurrentRate);
> + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize,
> + wCurrentRate);
> + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> + wCurrentRate);
> + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> + wCurrentRate, bNeedACK);
> + buf->rrv_time_b =
> + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> + pDevice->byTopCCKBasicRate, bNeedACK);
> +
> + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> + psEthHeader, wCurrentRate, byFBOption);
> } else {/* RTS_needless, PCF mode */
> struct vnt_rrv_time_cts *buf = pvRrvTime;
>
> - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate);
> + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> + wCurrentRate, bNeedACK);
> + buf->rrv_time_b =
> + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> + pDevice->byTopCCKBasicRate, bNeedACK);
> + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize,
> + wCurrentRate);
>
> /* Fill CTS */
> - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption);
> + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK,
> + bDisCRC, wCurrentRate, byFBOption);
> }
> } else if (byPktType == PK_TYPE_11A) {
> if (pvRTS) {/* RTS_need, non PCF mode */
> - struct vnt_rrv_time_ab *buf = pvRrvTime;
Error during compiliation in next line
> + struct vnt_rrv_time_ab *buf = pvRrvT
> + ime;
make: Entering directory '/home/kernel/Documents/git/kernels/staging'
CC [M] drivers/staging/vt6655/rxtx.o
drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’:
drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first
use in this function)
1014 | struct vnt_rrv_time_ab *buf = pvRrvT
| ^~~~~~
drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier
is reported only once for each function it appears in
drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before
‘ime’
1015 | ime;
| ^~~
make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o]
Error 1
make: *** [Makefile:1992: drivers/staging/vt6655] Error 2
make: Leaving directory '/home/kernel/Documents/git/kernels/staging'
>
> - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> + wCurrentRate);
> + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> + wCurrentRate, bNeedACK);
>
> /* Fill RTS */
> - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> + psEthHeader, wCurrentRate, byFBOption);
> } else if (!pvRTS) {/* RTS_needless, non PCF mode */
> struct vnt_rrv_time_ab *buf = pvRrvTime;
>
> - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK);
> + buf->rrv_time =
> + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize,
> + wCurrentRate, bNeedACK);
> }
> } else if (byPktType == PK_TYPE_11B) {
> if (pvRTS) {/* RTS_need, non PCF mode */
> struct vnt_rrv_time_ab *buf = pvRrvTime;
>
> - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> + wCurrentRate);
> + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> + wCurrentRate, bNeedACK);
>
> /* Fill RTS */
> - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> + psEthHeader, wCurrentRate, byFBOption);
> } else { /* RTS_needless, non PCF mode */
> struct vnt_rrv_time_ab *buf = pvRrvTime;
>
> - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> + wCurrentRate, bNeedACK);
> }
> }
> }
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-21 16:52 ` Philipp Hortmann
@ 2022-10-21 18:08 ` Tanju Brunostar
2022-10-21 18:14 ` Tanju Brunostar
0 siblings, 1 reply; 12+ messages in thread
From: Tanju Brunostar @ 2022-10-21 18:08 UTC (permalink / raw)
To: Philipp Hortmann; +Cc: gregkh, linux-staging, linux-kernel, outreachy
On Fri, Oct 21, 2022 at 5:52 PM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 10/21/22 12:33, Tanjuate Brunostar wrote:
> > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
> >
> > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> > ---
> > drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++-----------
> > 1 file changed, 48 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> > index dc853b83459b..42f4261293ba 100644
> > --- a/drivers/staging/vt6655/rxtx.c
> > +++ b/drivers/staging/vt6655/rxtx.c
> > @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice,
> > }
> >
> > if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
> > - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> > + if (byFBOption != AUTO_FB_NONE && uDMAIdx !=
> > + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> > /* Auto Fall back */
> > struct vnt_cts_fb *buf = pvCTS;
> > /* Get SignalField, ServiceField & Length */
> > @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice,
> >
> > ether_addr_copy(buf->data.ra,
> > pDevice->abyCurrentNetAddr);
> > - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */
> > + } else {
> > + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA &&
> > + * uDMAIdx != TYPE_BEACONDMA)
> > + */
> > struct vnt_cts *buf = pvCTS;
> > /* Get SignalField, ServiceField & Length */
> > vnt_get_phy_field(pDevice, uCTSFrameLen,
> > @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> > /* Fill RsvTime */
> > struct vnt_rrv_time_rts *buf = pvRrvTime;
> >
> > - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> > - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate);
> > - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> > -
> > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> > + wCurrentRate);
> > + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize,
> > + wCurrentRate);
> > + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> > + wCurrentRate);
> > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> > + buf->rrv_time_b =
> > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > + pDevice->byTopCCKBasicRate, bNeedACK);
> > +
> > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > + psEthHeader, wCurrentRate, byFBOption);
> > } else {/* RTS_needless, PCF mode */
> > struct vnt_rrv_time_cts *buf = pvRrvTime;
> >
> > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> > - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate);
> > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> > + buf->rrv_time_b =
> > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > + pDevice->byTopCCKBasicRate, bNeedACK);
> > + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize,
> > + wCurrentRate);
> >
> > /* Fill CTS */
> > - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption);
> > + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK,
> > + bDisCRC, wCurrentRate, byFBOption);
> > }
> > } else if (byPktType == PK_TYPE_11A) {
> > if (pvRTS) {/* RTS_need, non PCF mode */
> > - struct vnt_rrv_time_ab *buf = pvRrvTime;
>
> Error during compiliation in next line
>
> > + struct vnt_rrv_time_ab *buf = pvRrvT
> > + ime;
>
> make: Entering directory '/home/kernel/Documents/git/kernels/staging'
> CC [M] drivers/staging/vt6655/rxtx.o
> drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’:
> drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first
> use in this function)
> 1014 | struct vnt_rrv_time_ab *buf = pvRrvT
> | ^~~~~~
> drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier
> is reported only once for each function it appears in
> drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before
> ‘ime’
> 1015 | ime;
> | ^~~
> make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o]
> Error 1
> make: *** [Makefile:1992: drivers/staging/vt6655] Error 2
> make: Leaving directory '/home/kernel/Documents/git/kernels/staging'
>
This error occured on the first version of this patch. I corrected it,
compiled the code and the error was gone before I sent this version.
please check again. You may have seen this error on the first version
and not this one.
thanks
Tanju
> >
> > - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> > + wCurrentRate);
> > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> >
> > /* Fill RTS */
> > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > + psEthHeader, wCurrentRate, byFBOption);
> > } else if (!pvRTS) {/* RTS_needless, non PCF mode */
> > struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK);
> > + buf->rrv_time =
> > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> > }
> > } else if (byPktType == PK_TYPE_11B) {
> > if (pvRTS) {/* RTS_need, non PCF mode */
> > struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> > + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> > + wCurrentRate);
> > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> >
> > /* Fill RTS */
> > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > + psEthHeader, wCurrentRate, byFBOption);
> > } else { /* RTS_needless, non PCF mode */
> > struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > + wCurrentRate, bNeedACK);
> > }
> > }
> > }
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-21 18:08 ` Tanju Brunostar
@ 2022-10-21 18:14 ` Tanju Brunostar
2022-10-22 4:39 ` Philipp Hortmann
0 siblings, 1 reply; 12+ messages in thread
From: Tanju Brunostar @ 2022-10-21 18:14 UTC (permalink / raw)
To: Philipp Hortmann; +Cc: gregkh, linux-staging, linux-kernel, outreachy
On Fri, Oct 21, 2022 at 7:08 PM Tanju Brunostar
<tanjubrunostar0@gmail.com> wrote:
>
> On Fri, Oct 21, 2022 at 5:52 PM Philipp Hortmann
> <philipp.g.hortmann@gmail.com> wrote:
> >
> > On 10/21/22 12:33, Tanjuate Brunostar wrote:
> > > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
> > >
> > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> > > ---
> > > drivers/staging/vt6655/rxtx.c | 70 ++++++++++++++++++++++++-----------
> > > 1 file changed, 48 insertions(+), 22 deletions(-)
> > >
> > > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> > > index dc853b83459b..42f4261293ba 100644
> > > --- a/drivers/staging/vt6655/rxtx.c
> > > +++ b/drivers/staging/vt6655/rxtx.c
> > > @@ -839,7 +839,8 @@ s_vFillCTSHead(struct vnt_private *pDevice,
> > > }
> > >
> > > if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
> > > - if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> > > + if (byFBOption != AUTO_FB_NONE && uDMAIdx !=
> > > + TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
> > > /* Auto Fall back */
> > > struct vnt_cts_fb *buf = pvCTS;
> > > /* Get SignalField, ServiceField & Length */
> > > @@ -878,7 +879,10 @@ s_vFillCTSHead(struct vnt_private *pDevice,
> > >
> > > ether_addr_copy(buf->data.ra,
> > > pDevice->abyCurrentNetAddr);
> > > - } else { /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) */
> > > + } else {
> > > + /* if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA &&
> > > + * uDMAIdx != TYPE_BEACONDMA)
> > > + */
> > > struct vnt_cts *buf = pvCTS;
> > > /* Get SignalField, ServiceField & Length */
> > > vnt_get_phy_field(pDevice, uCTSFrameLen,
> > > @@ -964,50 +968,72 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> > > /* Fill RsvTime */
> > > struct vnt_rrv_time_rts *buf = pvRrvTime;
> > >
> > > - buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> > > - buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize, wCurrentRate);
> > > - buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> > > -
> > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > > + buf->rts_rrv_time_aa = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > > + buf->rts_rrv_time_ba = get_rtscts_time(pDevice, 1, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > > + buf->rts_rrv_time_bb = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > > + buf->rrv_time_b =
> > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > > + pDevice->byTopCCKBasicRate, bNeedACK);
> > > +
> > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > > + psEthHeader, wCurrentRate, byFBOption);
> > > } else {/* RTS_needless, PCF mode */
> > > struct vnt_rrv_time_cts *buf = pvRrvTime;
> > >
> > > - buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > > - buf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK);
> > > - buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize, wCurrentRate);
> > > + buf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > > + buf->rrv_time_b =
> > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > > + pDevice->byTopCCKBasicRate, bNeedACK);
> > > + buf->cts_rrv_time_ba = get_rtscts_time(pDevice, 3, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > >
> > > /* Fill CTS */
> > > - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption);
> > > + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK,
> > > + bDisCRC, wCurrentRate, byFBOption);
> > > }
> > > } else if (byPktType == PK_TYPE_11A) {
> > > if (pvRTS) {/* RTS_need, non PCF mode */
> > > - struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > Error during compiliation in next line
> >
> > > + struct vnt_rrv_time_ab *buf = pvRrvT
> > > + ime;
> >
> > make: Entering directory '/home/kernel/Documents/git/kernels/staging'
> > CC [M] drivers/staging/vt6655/rxtx.o
> > drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’:
> > drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first
> > use in this function)
> > 1014 | struct vnt_rrv_time_ab *buf = pvRrvT
> > | ^~~~~~
> > drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier
> > is reported only once for each function it appears in
> > drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before
> > ‘ime’
> > 1015 | ime;
> > | ^~~
> > make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o]
> > Error 1
> > make: *** [Makefile:1992: drivers/staging/vt6655] Error 2
> > make: Leaving directory '/home/kernel/Documents/git/kernels/staging'
> >
> This error occured on the first version of this patch. I corrected it,
> compiled the code and the error was gone before I sent this version.
> please check again. You may have seen this error on the first version
> and not this one.
> thanks
>
> Tanju
On the first patch, this error was detected by the kernel bot. This
time around, the kernel bot did not detect it, meaning it was fixed.
> > >
> > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize, wCurrentRate);
> > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK);
> > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 2, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > >
> > > /* Fill RTS */
> > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > > + psEthHeader, wCurrentRate, byFBOption);
> > > } else if (!pvRTS) {/* RTS_needless, non PCF mode */
> > > struct vnt_rrv_time_ab *buf = pvRrvTime;
> > >
> > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK);
> > > + buf->rrv_time =
> > > + vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > > }
> > > } else if (byPktType == PK_TYPE_11B) {
> > > if (pvRTS) {/* RTS_need, non PCF mode */
> > > struct vnt_rrv_time_ab *buf = pvRrvTime;
> > >
> > > - buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize, wCurrentRate);
> > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> > > + buf->rts_rrv_time = get_rtscts_time(pDevice, 0, byPktType, cbFrameSize,
> > > + wCurrentRate);
> > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > >
> > > /* Fill RTS */
> > > - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > > + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC,
> > > + psEthHeader, wCurrentRate, byFBOption);
> > > } else { /* RTS_needless, non PCF mode */
> > > struct vnt_rrv_time_ab *buf = pvRrvTime;
> > >
> > > - buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK);
> > > + buf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize,
> > > + wCurrentRate, bNeedACK);
> > > }
> > > }
> > > }
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-21 18:14 ` Tanju Brunostar
@ 2022-10-22 4:39 ` Philipp Hortmann
2022-10-22 5:49 ` Tanju Brunostar
0 siblings, 1 reply; 12+ messages in thread
From: Philipp Hortmann @ 2022-10-22 4:39 UTC (permalink / raw)
To: Tanju Brunostar; +Cc: gregkh, linux-staging, linux-kernel, outreachy
On 10/21/22 20:14, Tanju Brunostar wrote:
>>> Error during compiliation in next line
>>>
>>>> + struct vnt_rrv_time_ab *buf = pvRrvT
>>>> + ime;
>>> make: Entering directory '/home/kernel/Documents/git/kernels/staging'
>>> CC [M] drivers/staging/vt6655/rxtx.o
>>> drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’:
>>> drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first
>>> use in this function)
>>> 1014 | struct vnt_rrv_time_ab *buf = pvRrvT
>>> | ^~~~~~
>>> drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier
>>> is reported only once for each function it appears in
>>> drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before
>>> ‘ime’
>>> 1015 | ime;
>>> | ^~~
>>> make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o]
>>> Error 1
>>> make: *** [Makefile:1992: drivers/staging/vt6655] Error 2
>>> make: Leaving directory '/home/kernel/Documents/git/kernels/staging'
>>>
>> This error occured on the first version of this patch. I corrected it,
>> compiled the code and the error was gone before I sent this version.
>> please check again. You may have seen this error on the first version
>> and not this one.
>> thanks
>>
>> Tanju
> On the first patch, this error was detected by the kernel bot. This
> time around, the kernel bot did not detect it, meaning it was fixed.
Please check the outbox of your email account and have a look. This is
the v2 Patch and it contains this two lines:
>>>> + struct vnt_rrv_time_ab *buf = pvRrvT
>>>> + ime;
which do not compile.
Bye Philipp
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter
2022-10-22 4:39 ` Philipp Hortmann
@ 2022-10-22 5:49 ` Tanju Brunostar
0 siblings, 0 replies; 12+ messages in thread
From: Tanju Brunostar @ 2022-10-22 5:49 UTC (permalink / raw)
To: Philipp Hortmann; +Cc: gregkh, linux-staging, linux-kernel, outreachy
On Sat, Oct 22, 2022 at 5:39 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> wrote:
>
> On 10/21/22 20:14, Tanju Brunostar wrote:
> >>> Error during compiliation in next line
> >>>
> >>>> + struct vnt_rrv_time_ab *buf = pvRrvT
> >>>> + ime;
> >>> make: Entering directory '/home/kernel/Documents/git/kernels/staging'
> >>> CC [M] drivers/staging/vt6655/rxtx.o
> >>> drivers/staging/vt6655/rxtx.c: In function ‘s_vGenerateTxParameter’:
> >>> drivers/staging/vt6655/rxtx.c:1014:34: error: ‘pvRrvT’ undeclared (first
> >>> use in this function)
> >>> 1014 | struct vnt_rrv_time_ab *buf = pvRrvT
> >>> | ^~~~~~
> >>> drivers/staging/vt6655/rxtx.c:1014:34: note: each undeclared identifier
> >>> is reported only once for each function it appears in
> >>> drivers/staging/vt6655/rxtx.c:1015:5: error: expected ‘,’ or ‘;’ before
> >>> ‘ime’
> >>> 1015 | ime;
> >>> | ^~~
> >>> make[1]: *** [scripts/Makefile.build:250: drivers/staging/vt6655/rxtx.o]
> >>> Error 1
> >>> make: *** [Makefile:1992: drivers/staging/vt6655] Error 2
> >>> make: Leaving directory '/home/kernel/Documents/git/kernels/staging'
> >>>
> >> This error occured on the first version of this patch. I corrected it,
> >> compiled the code and the error was gone before I sent this version.
> >> please check again. You may have seen this error on the first version
> >> and not this one.
> >> thanks
> >>
> >> Tanju
> > On the first patch, this error was detected by the kernel bot. This
> > time around, the kernel bot did not detect it, meaning it was fixed.
>
> Please check the outbox of your email account and have a look. This is
> the v2 Patch and it contains this two lines:
> >>>> + struct vnt_rrv_time_ab *buf = pvRrvT
> >>>> + ime;
> which do not compile.
>
> Bye Philipp
Oh you are right. I don't know how this is possible. I will send a
third version.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-10-22 5:49 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-21 10:33 [PATCH v2 0/6] a series of checkpatch fixes on the file: rxtx.c Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 1/6] staging: vt6655: fix lines ending in a '(' Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 2/6] staging: vt6655: refactor long lines of code in s_uGetRTSCTSDuration Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter Tanjuate Brunostar
2022-10-21 16:52 ` Philipp Hortmann
2022-10-21 18:08 ` Tanju Brunostar
2022-10-21 18:14 ` Tanju Brunostar
2022-10-22 4:39 ` Philipp Hortmann
2022-10-22 5:49 ` Tanju Brunostar
2022-10-21 10:33 ` [PATCH v2 5/6] staging: vt6655: refactor long lines of code in the rest of the file Tanjuate Brunostar
2022-10-21 10:33 ` [PATCH v2 6/6] staging: vt6655: refactor code to avoid a line ending in '(' Tanjuate Brunostar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.