Commit bfa43928 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: avoid camel case in phy_CalculateBitShift() 



Rename the function phy_CalculateBitShift() and its parameter BitMask
to avoid camel case.

phy_CalculateBitShift -> phy_calculate_bit_shift
BitMask -> bitmask

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220806060929.11022-3-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 270e0509

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+6 −6
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
* Output:	none

* Return:		u32		Return the shift bit bit position of the mask

*/

static	u32 phy_CalculateBitShift(u32 BitMask)

static u32 phy_calculate_bit_shift(u32 bitmask)

{

	u32 i = ffs(BitMask);

	u32 i = ffs(bitmask);



	return i ? i - 1 : 32;

}
@@ -58,7 +58,7 @@ rtl8188e_PHY_QueryBBReg( 
	if (res)

		return 0;



	BitShift = phy_CalculateBitShift(BitMask);

	BitShift = phy_calculate_bit_shift(BitMask);

	ReturnValue = (OriginalValue & BitMask) >> BitShift;

	return ReturnValue;

}
@@ -91,7 +91,7 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3 
		if (res)

			return;



		BitShift = phy_CalculateBitShift(BitMask);

		BitShift = phy_calculate_bit_shift(BitMask);

		Data = ((OriginalValue & (~BitMask)) | (Data << BitShift));

	}
@@ -263,7 +263,7 @@ u32 rtl8188e_PHY_QueryRFReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask) 


	Original_Value = phy_RFSerialRead(Adapter, RegAddr);



	BitShift =  phy_CalculateBitShift(BitMask);

	BitShift =  phy_calculate_bit_shift(BitMask);

	Readback_Value = (Original_Value & BitMask) >> BitShift;

	return Readback_Value;

}
@@ -298,7 +298,7 @@ rtl8188e_PHY_SetRFReg( 
	/*  RF data is 12 bits only */

	if (BitMask != bRFRegOffsetMask) {

		Original_Value = phy_RFSerialRead(Adapter, RegAddr);

		BitShift =  phy_CalculateBitShift(BitMask);

		BitShift =  phy_calculate_bit_shift(BitMask);

		Data = ((Original_Value & (~BitMask)) | (Data << BitShift));

	}