Re: [linux-safety] [PATCH v2 2/2] staging: vt6655: Use macro in rxtx.c

[Lukas Bulwahn]

On Tue, Nov 24, 2020 at 11:49 AM Milan Lakhani
<milan.lakhani@xxxxxxxxxxxxxxx> wrote:
>
> Use macro for repeated function to get the data duration and timestamp,
> correcting line length and alignment warnings in rxtx.c. Reported by
> checkpatch.
>
> Signed-off-by: Milan Lakhani <milan.lakhani@xxxxxxxxxxxxxxx>

Patch looks good.

You need to CC:

devel@xxxxxxxxxxxxxxxxxxxx


> ---
>  drivers/staging/vt6655/rxtx.c | 51 ++++++++++++++++---------------------------
>  1 file changed, 19 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index 508e1bd..c5dfe3c 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -423,6 +423,10 @@ s_uGetRTSCTSDuration(
>         return cpu_to_le16((u16)uDurTime);
>  }
>
> +#define getDurationTimeStamp(byDurType, byPktType, wRate) \
> +       (cpu_to_le16((u16)s_uGetDataDuration(pDevice, (byDurType), cbFrameLength, (byPktType), \
> +               (wRate), bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)))
> +
>  static
>  __le16
>  s_uFillDataHead(
> @@ -467,15 +471,10 @@ s_uFillDataHead(
>                         } else {
>                                 /* Get Duration and TimeStamp */
>                                 buf->duration_a =
> -                                       cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength,
> -                                                                           byPktType, wCurrentRate, bNeedAck, uFragIdx,
> -                                                                           cbLastFragmentSize, uMACfragNum,
> -                                                                           byFBOption));
> +                                       getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate);
>                                 buf->duration_b =
> -                                       cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength,
> -                                                                           PK_TYPE_11B, pDevice->byTopCCKBasicRate,
> -                                                                           bNeedAck, uFragIdx, cbLastFragmentSize,
> -                                                                           uMACfragNum, byFBOption));
> +                                       getDurationTimeStamp(DATADUR_B, PK_TYPE_11B,
> +                                                            pDevice->byTopCCKBasicRate);
>                         }
>
>                         buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate);
> @@ -492,14 +491,11 @@ s_uFillDataHead(
>                                   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 = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate);
> +               buf->duration_b = getDurationTimeStamp(DATADUR_B, PK_TYPE_11B,
> +                                                      pDevice->byTopCCKBasicRate);
> +               buf->duration_a_f0 = getDurationTimeStamp(DATADUR_A_F0, byPktType, wCurrentRate);
> +               buf->duration_a_f1 = getDurationTimeStamp(DATADUR_A_F1, byPktType, wCurrentRate);
>
>                 buf->time_stamp_off_a = vnt_time_stamp_off(pDevice, wCurrentRate);
>                 buf->time_stamp_off_b = vnt_time_stamp_off(pDevice, pDevice->byTopCCKBasicRate);
> @@ -517,12 +513,11 @@ s_uFillDataHead(
>                                           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 = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate);
> +                       buf->duration_f0 = getDurationTimeStamp(DATADUR_A_F0, byPktType,
> +                                                               wCurrentRate);
> +                       buf->duration_f1 = getDurationTimeStamp(DATADUR_A_F1, byPktType,
> +                                                               wCurrentRate);
>                         buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
>                         return buf->duration;
>                 }
> @@ -537,11 +532,7 @@ s_uFillDataHead(
>                         buf->duration = dur;
>                 } else {
>                         /* 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 = getDurationTimeStamp(DATADUR_A, byPktType, wCurrentRate);
>                 }
>
>                 buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
> @@ -558,11 +549,7 @@ s_uFillDataHead(
>                 buf->duration = dur;
>         } else {
>                 /* Get Duration and TimeStampOff */
> -               buf->duration =
> -                       cpu_to_le16((u16)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType,
> -                                                           wCurrentRate, bNeedAck, uFragIdx,
> -                                                           cbLastFragmentSize, uMACfragNum,
> -                                                           byFBOption));
> +               buf->duration = getDurationTimeStamp(DATADUR_B, byPktType, wCurrentRate);
>         }
>
>         buf->time_stamp_off = vnt_time_stamp_off(pDevice, wCurrentRate);
> --
> 2.7.4
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#198): https://lists.elisa.tech/g/linux-safety/message/198
> Mute This Topic: https://lists.elisa.tech/mt/78474577/1714638
> Group Owner: linux-safety+owner@xxxxxxxxxxxxxxxx
> Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [lukas.bulwahn@xxxxxxxxx]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>