Commit 6dd19f19 authored by Anish Bhatt's avatar Anish Bhatt Committed by Greg Kroah-Hartman
Browse files

staging/rtl8188eu : Remove duplicated BIT() definitions 



The BIT() macro is already defined in bitops.h, remove duplicate
definitions. Users of BIT() macro are expecting unsigned int/u32, so
add typecasts where this creates a build warning.

Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9137f812

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+5 −2
Original line number Diff line number Diff line
@@ -4177,10 +4177,13 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) 


	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,

		 ("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",

		  GetFrameType(pframe), GetFrameSubType(pframe)));

		  (unsigned int)GetFrameType(pframe),

		  (unsigned int)GetFrameSubType(pframe)));



	if (GetFrameType(pframe) != WIFI_MGT_TYPE) {

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher: type(0x%x) error!\n", GetFrameType(pframe)));

		RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

			 ("mgt_dispatcher: type(0x%x) error!\n",

			  (unsigned int)GetFrameType(pframe)));

		return;

	}

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+4 −2
Original line number Diff line number Diff line
@@ -1414,13 +1414,15 @@ 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/rtl8188eu/include/rtl8188e_spec.h

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 
#ifndef __RTL8188E_SPEC_H__

#define __RTL8188E_SPEC_H__



#ifndef BIT

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

#endif



#define BIT0	0x00000001

#define BIT1	0x00000002

#define BIT2	0x00000004

drivers/staging/rtl8188eu/include/wifi.h

+0 −7
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 
#ifndef _WIFI_H_

#define _WIFI_H_





#ifdef BIT

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

#undef BIT

#endif

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



#define WLAN_IEEE_OUI_LEN	3

#define WLAN_CRC_LEN		4

#define WLAN_BSSID_LEN		6