2022-10-22 09:17:33

by Tanjuate Brunostar

Subject: [PATCH v3 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead

fix checkpatch errors by refactoring long lines of code in the function: s_uFillDataHead

Signed-off-by: Tanjuate Brunostar <[email protected]>
---
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

2022-10-22 09:27:29

by Greg Kroah-Hartman

Subject: Re: [PATCH v3 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead

On Sat, Oct 22, 2022 at 07:06:09AM +0000, Tanjuate Brunostar wrote:
> fix checkpatch errors by refactoring long lines of code in the function: s_uFillDataHead
>
> Signed-off-by: Tanjuate Brunostar <[email protected]>
> ---
> 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,

Why is this function not returning u16 to start with? Everywhere it is
used it is casted.

Please fix that up first, then fix up the function name itself, and then
work on shortening these lines, as that will be much better overall.

thanks,

greg k-h

2022-10-22 09:38:37

by Tanjuate Brunostar

Subject: Re: [PATCH v3 3/6] staging: vt6655: refactor long lines of code in s_uFillDataHead

On Sat, Oct 22, 2022 at 9:17 AM Greg KH <[email protected]> wrote:
>
> On Sat, Oct 22, 2022 at 07:06:09AM +0000, Tanjuate Brunostar wrote:
> > fix checkpatch errors by refactoring long lines of code in the function: s_uFillDataHead
> >
> > Signed-off-by: Tanjuate Brunostar <[email protected]>
> > ---
> > 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,
>
> Why is this function not returning u16 to start with? Everywhere it is
> used it is casted.
>
> Please fix that up first, then fix up the function name itself, and then
> work on shortening these lines, as that will be much better overall.
>
> thanks,
>
> greg k-h
OK