On Fri, 13 Aug 2021 at 08:32, Michael Straube <straube.linux@xxxxxxxxx> wrote:
>
> Remove 5GHz code from Hal_GetChnlGroup88E().
>
> Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
> ---
> .../staging/r8188eu/hal/rtl8188e_hal_init.c | 62 +++++--------------
> 1 file changed, 14 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
> index f0560c15387c..634a0a022727 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
> @@ -2062,54 +2062,20 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G,
>
> static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
> {
> - u8 bIn24G = true;
> -
> - if (chnl <= 14) {
> - bIn24G = true;
> -
> - if (chnl < 3) /* Channel 1-2 */
> - *pGroup = 0;
> - else if (chnl < 6) /* Channel 3-5 */
> - *pGroup = 1;
> - else if (chnl < 9) /* Channel 6-8 */
> - *pGroup = 2;
> - else if (chnl < 12) /* Channel 9-11 */
> - *pGroup = 3;
> - else if (chnl < 14) /* Channel 12-13 */
> - *pGroup = 4;
> - else if (chnl == 14) /* Channel 14 */
> - *pGroup = 5;
> - } else {
> - bIn24G = false;
> -
> - if (chnl <= 40)
> - *pGroup = 0;
> - else if (chnl <= 48)
> - *pGroup = 1;
> - else if (chnl <= 56)
> - *pGroup = 2;
> - else if (chnl <= 64)
> - *pGroup = 3;
> - else if (chnl <= 104)
> - *pGroup = 4;
> - else if (chnl <= 112)
> - *pGroup = 5;
> - else if (chnl <= 120)
> - *pGroup = 5;
> - else if (chnl <= 128)
> - *pGroup = 6;
> - else if (chnl <= 136)
> - *pGroup = 7;
> - else if (chnl <= 144)
> - *pGroup = 8;
> - else if (chnl <= 153)
> - *pGroup = 9;
> - else if (chnl <= 161)
> - *pGroup = 10;
> - else if (chnl <= 177)
> - *pGroup = 11;
> - }
> - return bIn24G;
> + if (chnl < 3) /* Channel 1-2 */
> + *pGroup = 0;
> + else if (chnl < 6) /* Channel 3-5 */
> + *pGroup = 1;
> + else if (chnl < 9) /* Channel 6-8 */
> + *pGroup = 2;
> + else if (chnl < 12) /* Channel 9-11 */
> + *pGroup = 3;
> + else if (chnl < 14) /* Channel 12-13 */
> + *pGroup = 4;
> + else if (chnl == 14) /* Channel 14 */
> + *pGroup = 5;
> +
> + return true;
> }
>
> void Hal_ReadPowerSavingMode88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)
> --
> 2.32.0
>
Dear Michael,
Looks good to me, thanks.
Acked-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
Regards,
Phil
