Commit eb563e69 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove local BIT macro 



The r8188eu driver defines a local BIT(x) macro. Remove this local macro
and use the one from include/linux/bits.h.

The global BIT macro returns an unsigned long value, the removed local
BIT macro used a signed int.

DYNAMIC_BB_DYNAMIC_TXPWR is defined as BIT(2), ~DYNAMIC_BB_DYNAMIC_TXPWR
is passed to Switch_DM_Func as a u32 parameter. We need a cast in this
case as ~DYNAMIC_BB_DYNAMIC_TXPWR is a 64-bit value on x86_64 systems.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220319180342.3143734-1-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_wlan_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1276,13 +1276,13 @@ void update_IOT_info(struct adapter *padapter) 
		pmlmeinfo->turboMode_cts2self = 0;

		pmlmeinfo->turboMode_rtsen = 1;

		/* disable high power */

		Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);

		Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false);

		break;

	case HT_IOT_PEER_REALTEK:

		/* rtw_write16(padapter, 0x4cc, 0xffff); */

		/* rtw_write16(padapter, 0x546, 0x01c0); */

		/* disable high power */

		Switch_DM_Func(padapter, (~DYNAMIC_BB_DYNAMIC_TXPWR), false);

		Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false);

		break;

	default:

		pmlmeinfo->turboMode_cts2self = 0;

drivers/staging/r8188eu/include/wifi.h

+1 −6
Original line number Diff line number Diff line
@@ -4,14 +4,9 @@ 
#ifndef _WIFI_H_

#define _WIFI_H_



#include <linux/bits.h>

#include <linux/ieee80211.h>



#ifdef BIT

/* error	"BIT define occurred earlier elsewhere!\n" */

#undef BIT

#endif

#define BIT(x)	(1 << (x))



#define WLAN_ETHHDR_LEN		14

#define WLAN_HDR_A3_LEN		24

#define WLAN_HDR_A3_QOS_LEN	26