On Thu, Nov 3, 2022 at 1:38 PM Julia Lawall <julia.lawall@xxxxxxxx> wrote:
>
>
>
> On Thu, 3 Nov 2022, Tanjuate Brunostar wrote:
>
> > Remove the use of Hungarian notation, which is not used in the Linux
> > kernel. Reported by checkpatch
> >
> > Fix checkpatch error related to code line ends with a '(', by joining
> > some lines and indenting correctly. This improves visibility
>
> I don't think it will be appreciated to do two things at once.
>
I sent it earlier as two patches but it seemed to break and fix the
kernel which was not appreciated by one of the mentors
> >
> > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@xxxxxxxxx>
> > ---
> > drivers/staging/vt6655/rxtx.c | 48 ++++++++++++++++-------------------
> > 1 file changed, 22 insertions(+), 26 deletions(-)
> >
> > diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> > index 31ae99b3cb35..debc5d5daede 100644
> > --- a/drivers/staging/vt6655/rxtx.c
> > +++ b/drivers/staging/vt6655/rxtx.c
> > @@ -23,7 +23,7 @@
> > * s_uGetTxRsvTime- get frame reserved time
> > * s_vFillCTSHead- fulfill CTS ctl header
> > * s_vFillFragParameter- Set fragment ctl parameter.
> > - * s_vFillRTSHead- fulfill RTS ctl header
> > + * fill_rts_header- fulfill RTS ctl header
> > * s_vFillTxKey- fulfill tx encrypt key
> > * s_vSWencryption- Software encrypt header
> > * vDMA0_tx_80211- tx 802.11 frame via dma0
> > @@ -85,15 +85,15 @@ static const unsigned short fb_opt1[2][5] = {
> > #define DATADUR_A_F1 13
> >
> > /*--------------------- Static Functions --------------------------*/
> > -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 fill_rts_header(struct vnt_private *pDevice,
> > + unsigned char byPktType,
> > + void *pvRTS,
> > + unsigned int cbFrameLength,
>
> Strange spacing in the above parameter declaration. Maybe there is a tab
> that should be a space?
>
> julia
>
I was also shocked when I noticed that. It seemed like a tab but when
I removed the space, the two words were joined and when I added the
space, it became this lage space once again. checkpatch does not
complain about it though
> > + bool bNeedAck,
> > + bool bDisCRC,
> > + struct ieee80211_hdr *hdr,
> > + unsigned short wCurrentRate,
> > + unsigned char byFBOption);
> >
> > static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> > unsigned char byPktType,
> > @@ -555,19 +555,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 fill_rts_header(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;
> >
> > @@ -912,7 +908,7 @@ s_vGenerateTxParameter(
> > 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);
> > + fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > } else {/* RTS_needless, PCF mode */
> > struct vnt_rrv_time_cts *buf = pvRrvTime;
> >
> > @@ -931,7 +927,7 @@ s_vGenerateTxParameter(
> > 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);
> > + fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > } else if (!pvRTS) {/* RTS_needless, non PCF mode */
> > struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > @@ -945,7 +941,7 @@ s_vGenerateTxParameter(
> > 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);
> > + fill_rts_header(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
> > } else { /* RTS_needless, non PCF mode */
> > struct vnt_rrv_time_ab *buf = pvRrvTime;
> >
> > --
> > 2.34.1
> >
> >
> >
