Re: [PATCH v2 3/3] staging: r8188eu: perform cleanup in rtl8188e_Add_RateATid

[Greg KH]

On Tue, Aug 17, 2021 at 09:05:43AM +0200, Michael Straube wrote:
> On 8/17/21 1:44 AM, Phillip Potter wrote:
> > Perform some cleanup items in the rtl8188e_Add_RateATid function:
> > (1) Rename variable shortGIrate to short_gi_rate to comply with kernel
> >      camel case rules.
> > (2) Introduce additional whitespace around certain operators in the
> >      function, to make it clearer what is happening.
> > 
> > Signed-off-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
> > ---
> >   drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 14 +++++++-------
> >   1 file changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
> > index 77c057e276a5..8d03b24dc5af 100644
> > --- a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
> > +++ b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c
> > @@ -155,25 +155,25 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
> >   {
> >   	struct hal_data_8188e *haldata = GET_HAL_DATA(pAdapter);
> > -	u8 macid, raid, shortGIrate = false;
> > +	u8 macid, raid, short_gi_rate = false;
> > -	macid = arg&0x1f;
> > +	macid = arg & 0x1f;
> > -	raid = (bitmap>>28) & 0x0f;
> > +	raid = (bitmap >> 28) & 0x0f;
> >   	bitmap &= 0x0fffffff;
> >   	if (rssi_level != DM_RATR_STA_INIT)
> >   		bitmap = ODM_Get_Rate_Bitmap(&haldata->odmpriv, macid, bitmap, rssi_level);
> > -	bitmap |= ((raid<<28)&0xf0000000);
> > +	bitmap |= ((raid << 28) & 0xf0000000);
> > -	shortGIrate = (arg&BIT(5)) ? true : false;
> > +	short_gi_rate = (arg & BIT(5)) ? true : false;
> > -	raid = (bitmap>>28) & 0x0f;
> > +	raid = (bitmap >> 28) & 0x0f;
> >   	bitmap &= 0x0fffffff;
> > -	ODM_RA_UpdateRateInfo_8188E(&haldata->odmpriv, macid, raid, bitmap, shortGIrate);
> > +	ODM_RA_UpdateRateInfo_8188E(&haldata->odmpriv, macid, raid, bitmap, short_gi_rate);
> >   }
> >   void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
> > 
> 
> Perhaps the added spaces around operators could conflict with
> pending patch sets that address spacing style issues, otherwise...

Yeah, it conflicted too much, so I couldn't apply this one.

Phillip, can you rebase and resend this one patch, your first 2 worked
just fine and are now in my tree.

thanks,

greg k-h