Re: [PATCH 4/6] staging: vt6655: refactor long lines of code in s_vGenerateTxParameter

[Tanju Brunostar]

On Fri, Oct 21, 2022 at 8:16 AM Julia Lawall <julia.lawall@xxxxxxxx> wrote:
>
>
>
> On Fri, 21 Oct 2022, Praveen Kumar wrote:
>
> > On 20-10-2022 23:57, Tanjuate Brunostar wrote:
> > > fix checkpatch errors by refactoring long lines of code in the function: s_vGenerateTxParameter
> > >
> > > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@xxxxxxxxx>
> > > ---
> > >  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;
> >
> > I'm not sure if this patch is compiled ? In my understanding the recommendation is have the patch compiled and if possible basic sanity done (can discuss with respective maintainers if they can help / guide) before sending here. Please do the needful. Thanks.
>
> In particular, always be sure that you have a .o file for the .c file that
> you changed.  The safest is to first try just compiling the file:
>
> make path/to/my/file.o
>
> Some files can't be compiled in that way.  You may need to do, eg
>
> make path/to/my/
>
> instead, but then there is a risk that even if you have compiled the
> directory, you have not actually compled the file that you changed.  So
> always check for the .o file.
>
> julia
>
>
> >
> > >
> > > -                   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);
> > >             }
> > >     }
> > >  }
> >
> > Regards,
> >
> > ~Praveen.
> >
> >
Thanks for the guidance. Will do that