staging: r8188eu: remove DBG_88E calls from hal subdir (db67ebf6) · Commits · jan.koester / Linux

drivers/staging/r8188eu/hal/HalPwrSeqCmd.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,6 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, struct wl_pwr_cfg pwrseqcmd[])
	udelay(10);		udelay(10);

	if (poll_count++ > max_poll_count) {		if (poll_count++ > max_poll_count) {
	DBG_88E("Fail to polling Offset[%#x]\n", offset);
	return false;		return false;
	}		}
	} while (!poll_bit);		} while (!poll_bit);

drivers/staging/r8188eu/hal/hal_intf.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ uint rtw_hal_init(struct adapter *adapt)
	hal_notch_filter_8188e(adapt, 1);		hal_notch_filter_8188e(adapt, 1);
	} else {		} else {
	adapt->hw_init_completed = false;		adapt->hw_init_completed = false;
	DBG_88E("rtw_hal_init: hal__init fail\n");
	}		}

	return status;		return status;
	@@ -36,7 +35,7 @@ uint rtw_hal_deinit(struct adapter *adapt)
	if (status == _SUCCESS)		if (status == _SUCCESS)
	adapt->hw_init_completed = false;		adapt->hw_init_completed = false;
	else		else
	DBG_88E("\n rtw_hal_deinit: hal_init fail\n");		;

	return status;		return status;
	}		}

drivers/staging/r8188eu/hal/rtl8188e_cmd.c

+2 −24

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,6 @@ static s32 FillH2CCmd_88E(struct adapter adapt, u8 ElementID, u32 CmdLen, u8 p
	u32 h2c_cmd_ex = 0;		u32 h2c_cmd_ex = 0;

	if (!adapt->bFWReady) {		if (!adapt->bFWReady) {
	DBG_88E("FillH2CCmd_88E(): return H2C cmd because fw is not ready\n");
	return _FAIL;		return _FAIL;
	}		}

	@@ -67,7 +66,6 @@ static s32 FillH2CCmd_88E(struct adapter adapt, u8 ElementID, u32 CmdLen, u8 p
	h2c_box_num = haldata->LastHMEBoxNum;		h2c_box_num = haldata->LastHMEBoxNum;

	if (!_is_fw_read_cmd_down(adapt, h2c_box_num)) {		if (!_is_fw_read_cmd_down(adapt, h2c_box_num)) {
	DBG_88E(" fw read cmd failed...\n");
	return _FAIL;		return _FAIL;
	}		}

	@@ -115,7 +113,6 @@ u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)

	FillH2CCmd_88E(adapt, H2C_DM_MACID_CFG, 3, buf);		FillH2CCmd_88E(adapt, H2C_DM_MACID_CFG, 3, buf);
	} else {		} else {
	DBG_88E("==>%s fw dont support RA\n", __func__);
	res = _FAIL;		res = _FAIL;
	}		}

	@@ -157,9 +154,6 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)
	struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;		struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;
	u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */		u8 RLBM = 0; /* 0:Min, 1:Max, 2:User define */

	DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,
	Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable);

	switch (Mode) {		switch (Mode) {
	case PS_MODE_ACTIVE:		case PS_MODE_ACTIVE:
	H2CSetPwrMode.Mode = 0;		H2CSetPwrMode.Mode = 0;
	@@ -200,12 +194,8 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode)

	void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)		void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
	{		{
	u8 opmode, macid;
	u16 mst_rpt = le16_to_cpu(mstatus_rpt);		u16 mst_rpt = le16_to_cpu(mstatus_rpt);
	opmode = (u8)mst_rpt;
	macid = (u8)(mst_rpt >> 8);

	DBG_88E("### %s: MStatus=%x MACID=%d\n", __func__, opmode, macid);
	FillH2CCmd_88E(adapt, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);		FillH2CCmd_88E(adapt, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
	}		}

	@@ -286,7 +276,6 @@ static void ConstructBeacon(struct adapter adapt, u8 pframe, u32 *pLength)
	_ConstructBeacon:		_ConstructBeacon:

	if ((pktlen + TXDESC_SIZE) > 512) {		if ((pktlen + TXDESC_SIZE) > 512) {
	DBG_88E("beacon frame too large\n");
	return;		return;
	}		}

	@@ -453,10 +442,8 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished)
	u32 TotalPacketLen;		u32 TotalPacketLen;
	struct rsvdpage_loc RsvdPageLoc;		struct rsvdpage_loc RsvdPageLoc;

	DBG_88E("%s\n", __func__);
	ReservedPagePacket = kzalloc(1000, GFP_KERNEL);		ReservedPagePacket = kzalloc(1000, GFP_KERNEL);
	if (!ReservedPagePacket) {		if (!ReservedPagePacket) {
	DBG_88E("%s: alloc ReservedPagePacket fail!\n", __func__);
	return;		return;
	}		}

	@@ -535,7 +522,6 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished)

	rtl8188eu_mgnt_xmit(adapt, pmgntframe);		rtl8188eu_mgnt_xmit(adapt, pmgntframe);

	DBG_88E("%s: Set RSVD page location to Fw\n", __func__);
	FillH2CCmd_88E(adapt, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8 *)&RsvdPageLoc);		FillH2CCmd_88E(adapt, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8 *)&RsvdPageLoc);

	exit:		exit:
	@@ -552,8 +538,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
	u8 DLBcnCount = 0;		u8 DLBcnCount = 0;
	u32 poll = 0;		u32 poll = 0;

	DBG_88E("%s mstatus(%x)\n", __func__, mstatus);

	if (mstatus == 1) {		if (mstatus == 1) {
	/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */		/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
	/* Suggested by filen. Added by tynli. */		/* Suggested by filen. Added by tynli. */
	@@ -571,7 +555,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
	rtw_write8(adapt, REG_BCN_CTRL, rtw_read8(adapt, REG_BCN_CTRL) \| BIT(4));		rtw_write8(adapt, REG_BCN_CTRL, rtw_read8(adapt, REG_BCN_CTRL) \| BIT(4));

	if (haldata->RegFwHwTxQCtrl & BIT(6)) {		if (haldata->RegFwHwTxQCtrl & BIT(6)) {
	DBG_88E("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n");
	bSendBeacon = true;		bSendBeacon = true;
	}		}

	@@ -599,9 +582,9 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
	if (adapt->bSurpriseRemoved \|\| adapt->bDriverStopped)		if (adapt->bSurpriseRemoved \|\| adapt->bDriverStopped)
	;		;
	else if (!bcn_valid)		else if (!bcn_valid)
	DBG_88E("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);		;
	else		else
	DBG_88E("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);		;
	/* */		/* */
	/* We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) */		/* We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) */
	/* because we need to free the Tx BCN Desc which is used by the first reserved page packet. */		/* because we need to free the Tx BCN Desc which is used by the first reserved page packet. */
	@@ -626,7 +609,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)
	/* Update RSVD page location H2C to Fw. */		/* Update RSVD page location H2C to Fw. */
	if (bcn_valid) {		if (bcn_valid) {
	SetHwReg8188EU(adapt, HW_VAR_BCN_VALID, NULL);		SetHwReg8188EU(adapt, HW_VAR_BCN_VALID, NULL);
	DBG_88E("Set RSVD page location to Fw.\n");
	}		}

	/* Do not enable HW DMA BCN or it will cause Pcie interface hang by timing issue. 2011.11.24. by tynli. */		/* Do not enable HW DMA BCN or it will cause Pcie interface hang by timing issue. 2011.11.24. by tynli. */
	@@ -646,11 +628,9 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)

	switch (p2p_ps_state) {		switch (p2p_ps_state) {
	case P2P_PS_DISABLE:		case P2P_PS_DISABLE:
	DBG_88E("P2P_PS_DISABLE\n");
	memset(p2p_ps_offload, 0, 1);		memset(p2p_ps_offload, 0, 1);
	break;		break;
	case P2P_PS_ENABLE:		case P2P_PS_ENABLE:
	DBG_88E("P2P_PS_ENABLE\n");
	/* update CTWindow value. */		/* update CTWindow value. */
	if (pwdinfo->ctwindow > 0) {		if (pwdinfo->ctwindow > 0) {
	p2p_ps_offload->CTWindow_En = 1;		p2p_ps_offload->CTWindow_En = 1;
	@@ -690,11 +670,9 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)
	}		}
	break;		break;
	case P2P_PS_SCAN:		case P2P_PS_SCAN:
	DBG_88E("P2P_PS_SCAN\n");
	p2p_ps_offload->discovery = 1;		p2p_ps_offload->discovery = 1;
	break;		break;
	case P2P_PS_SCAN_DONE:		case P2P_PS_SCAN_DONE:
	DBG_88E("P2P_PS_SCAN_DONE\n");
	p2p_ps_offload->discovery = 0;		p2p_ps_offload->discovery = 0;
	pwdinfo->p2p_ps_state = P2P_PS_ENABLE;		pwdinfo->p2p_ps_state = P2P_PS_ENABLE;
	break;		break;

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −39

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable)
	rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 \| SW_OFFLOAD_EN);		rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 \| SW_OFFLOAD_EN);

	if (!padapter->bFWReady) {		if (!padapter->bFWReady) {
	DBG_88E("bFWReady == false call reset 8051...\n");
	rtw_reset_8051(padapter);		rtw_reset_8051(padapter);
	}		}

	@@ -78,13 +77,11 @@ efuse_phymap_to_logical(u8 phymap, u16 _offset, u16 _size_byte, u8 pbuf)

	efuseTbl = kzalloc(EFUSE_MAP_LEN_88E, GFP_KERNEL);		efuseTbl = kzalloc(EFUSE_MAP_LEN_88E, GFP_KERNEL);
	if (!efuseTbl) {		if (!efuseTbl) {
	DBG_88E("%s: alloc efuseTbl fail!\n", __func__);
	goto exit;		goto exit;
	}		}

	eFuseWord = rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));		eFuseWord = rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
	if (!eFuseWord) {		if (!eFuseWord) {
	DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
	goto exit;		goto exit;
	}		}

	@@ -102,7 +99,6 @@ efuse_phymap_to_logical(u8 phymap, u16 _offset, u16 _size_byte, u8 pbuf)
	efuse_utilized++;		efuse_utilized++;
	eFuse_Addr++;		eFuse_Addr++;
	} else {		} else {
	DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data =%x\n", eFuse_Addr, rtemp8);
	goto exit;		goto exit;
	}		}

	@@ -207,8 +203,6 @@ static void efuse_read_phymap_from_txpktbuf(
	if (bcnhead < 0) /* if not valid */		if (bcnhead < 0) /* if not valid */
	bcnhead = rtw_read8(adapter, REG_TDECTRL + 1);		bcnhead = rtw_read8(adapter, REG_TDECTRL + 1);

	DBG_88E("%s bcnhead:%d\n", __func__, bcnhead);

	rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);		rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);

	dbg_addr = bcnhead * 128 / 8; /* 8-bytes addressing */		dbg_addr = bcnhead * 128 / 8; /* 8-bytes addressing */
	@@ -220,7 +214,6 @@ static void efuse_read_phymap_from_txpktbuf(
	start = jiffies;		start = jiffies;
	while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) &&		while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) &&
	(passing_time = rtw_get_passing_time_ms(start)) < 1000) {		(passing_time = rtw_get_passing_time_ms(start)) < 1000) {
	DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106));
	rtw_usleep_os(100);		rtw_usleep_os(100);
	}		}

	@@ -233,14 +226,12 @@ static void efuse_read_phymap_from_txpktbuf(
	* do not remove it as the rtw_read16() call consumes		* do not remove it as the rtw_read16() call consumes
	* 2 bytes from the EEPROM source.		* 2 bytes from the EEPROM source.
	*/		*/
	u16 lenc = rtw_read16(adapter, REG_PKTBUF_DBG_DATA_L);		rtw_read16(adapter, REG_PKTBUF_DBG_DATA_L);

	len = le32_to_cpu(lo32) & 0x0000ffff;		len = le32_to_cpu(lo32) & 0x0000ffff;

	limit = (len - 2 < limit) ? len - 2 : limit;		limit = (len - 2 < limit) ? len - 2 : limit;

	DBG_88E("%s len:%u, lenc:%u\n", __func__, len, lenc);

	memcpy(pos, ((u8 *)&lo32) + 2, (limit >= count + 2) ? 2 : limit - count);		memcpy(pos, ((u8 *)&lo32) + 2, (limit >= count + 2) ? 2 : limit - count);
	count += (limit >= count + 2) ? 2 : limit - count;		count += (limit >= count + 2) ? 2 : limit - count;
	pos = content + count;		pos = content + count;
	@@ -261,7 +252,6 @@ static void efuse_read_phymap_from_txpktbuf(
	i++;		i++;
	}		}
	rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);		rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);
	DBG_88E("%s read count:%u\n", __func__, count);
	*size = count;		*size = count;
	}		}

	@@ -285,7 +275,6 @@ s32 rtl8188e_iol_efuse_patch(struct adapter *padapter)
	{		{
	s32 result = _SUCCESS;		s32 result = _SUCCESS;

	DBG_88E("==> %s\n", __func__);
	if (rtw_IOL_applied(padapter)) {		if (rtw_IOL_applied(padapter)) {
	iol_mode_enable(padapter, 1);		iol_mode_enable(padapter, 1);
	result = iol_execute(padapter, CMD_READ_EFUSE_MAP);		result = iol_execute(padapter, CMD_READ_EFUSE_MAP);
	@@ -385,19 +374,16 @@ static void Hal_EfuseReadEFuse88E(struct adapter *Adapter,
	/* Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. */		/* Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. */
	/* */		/* */
	if ((_offset + _size_byte) > EFUSE_MAP_LEN_88E) {/* total E-Fuse table is 512bytes */		if ((_offset + _size_byte) > EFUSE_MAP_LEN_88E) {/* total E-Fuse table is 512bytes */
	DBG_88E("Hal_EfuseReadEFuse88E(): Invalid offset(%#x) with read bytes(%#x)!!\n", _offset, _size_byte);
	goto exit;		goto exit;
	}		}

	efuseTbl = kzalloc(EFUSE_MAP_LEN_88E, GFP_KERNEL);		efuseTbl = kzalloc(EFUSE_MAP_LEN_88E, GFP_KERNEL);
	if (!efuseTbl) {		if (!efuseTbl) {
	DBG_88E("%s: alloc efuseTbl fail!\n", __func__);
	goto exit;		goto exit;
	}		}

	eFuseWord = rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));		eFuseWord = rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
	if (!eFuseWord) {		if (!eFuseWord) {
	DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
	goto exit;		goto exit;
	}		}

	@@ -415,7 +401,6 @@ static void Hal_EfuseReadEFuse88E(struct adapter *Adapter,
	efuse_utilized++;		efuse_utilized++;
	eFuse_Addr++;		eFuse_Addr++;
	} else {		} else {
	DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data =%x\n", eFuse_Addr, *rtemp8);
	goto exit;		goto exit;
	}		}

	@@ -542,11 +527,9 @@ void rtl8188e_SetHalODMVar(struct adapter Adapter, void pValue1, bool bSet)
	struct sta_info psta = (struct sta_info )pValue1;		struct sta_info psta = (struct sta_info )pValue1;

	if (bSet) {		if (bSet) {
	DBG_88E("### Set STA_(%d) info\n", psta->mac_id);
	podmpriv->pODM_StaInfo[psta->mac_id] = psta;		podmpriv->pODM_StaInfo[psta->mac_id] = psta;
	ODM_RAInfo_Init(podmpriv, psta->mac_id);		ODM_RAInfo_Init(podmpriv, psta->mac_id);
	} else {		} else {
	DBG_88E("### Clean STA_(%d) info\n", psta->mac_id);
	podmpriv->pODM_StaInfo[psta->mac_id] = NULL;		podmpriv->pODM_StaInfo[psta->mac_id] = NULL;
	}		}
	}		}
	@@ -554,10 +537,8 @@ void rtl8188e_SetHalODMVar(struct adapter Adapter, void pValue1, bool bSet)
	void hal_notch_filter_8188e(struct adapter *adapter, bool enable)		void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
	{		{
	if (enable) {		if (enable) {
	DBG_88E("Enable notch filter\n");
	rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) \| BIT(1));		rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) \| BIT(1));
	} else {		} else {
	DBG_88E("Disable notch filter\n");
	rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) & ~BIT(1));		rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) & ~BIT(1));
	}		}
	}		}
	@@ -791,11 +772,6 @@ void Hal_ReadPowerSavingMode88E(struct adapter padapter, u8 hwinfo, bool AutoL
	/* decide hw if support remote wakeup function */		/* decide hw if support remote wakeup function */
	/* if hw supported, 8051 (SIE) will generate WeakUP signal(D+/D- toggle) when autoresume */		/* if hw supported, 8051 (SIE) will generate WeakUP signal(D+/D- toggle) when autoresume */
	padapter->pwrctrlpriv.bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT(1)) ? true : false;		padapter->pwrctrlpriv.bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT(1)) ? true : false;

	DBG_88E("%s , bSupportRemoteWakeup(%x)\n", __func__,
	padapter->pwrctrlpriv.bSupportRemoteWakeup);

	DBG_88E("### PS params => power_mgnt(%x), usbss_enable(%x) ###\n", padapter->registrypriv.power_mgnt, padapter->registrypriv.usbss_enable);
	}		}
	}		}

	@@ -816,17 +792,10 @@ void Hal_ReadTxPowerInfo88E(struct adapter padapter, u8 PROMContent, bool Auto
	pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][4];		pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][4];
	else		else
	pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][group];		pHalData->Index24G_BW40_Base[ch] = pwrInfo24G.IndexBW40_Base[0][group];

	DBG_88E("======= Path 0, Channel %d =======\n", ch);
	DBG_88E("Index24G_CCK_Base[%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[ch]);
	DBG_88E("Index24G_BW40_Base[%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[ch]);
	}		}
	for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {		for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
	pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];		pHalData->OFDM_24G_Diff[TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
	pHalData->BW20_24G_Diff[TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];		pHalData->BW20_24G_Diff[TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
	DBG_88E("======= TxCount %d =======\n", TxCount);
	DBG_88E("OFDM_24G_Diff[%d] = %d\n", TxCount, pHalData->OFDM_24G_Diff[TxCount]);
	DBG_88E("BW20_24G_Diff[%d] = %d\n", TxCount, pHalData->BW20_24G_Diff[TxCount]);
	}		}

	/* 2010/10/19 MH Add Regulator recognize for CU. */		/* 2010/10/19 MH Add Regulator recognize for CU. */
	@@ -837,7 +806,6 @@ void Hal_ReadTxPowerInfo88E(struct adapter padapter, u8 PROMContent, bool Auto
	} else {		} else {
	pHalData->EEPROMRegulatory = 0;		pHalData->EEPROMRegulatory = 0;
	}		}
	DBG_88E("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory);
	}		}

	void Hal_EfuseParseXtal_8188E(struct adapter pAdapter, u8 hwinfo, bool AutoLoadFail)		void Hal_EfuseParseXtal_8188E(struct adapter pAdapter, u8 hwinfo, bool AutoLoadFail)
	@@ -851,7 +819,6 @@ void Hal_EfuseParseXtal_8188E(struct adapter pAdapter, u8 hwinfo, bool AutoLoa
	} else {		} else {
	pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E;		pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E;
	}		}
	DBG_88E("CrystalCap: 0x%2x\n", pHalData->CrystalCap);
	}		}

	void rtl8188e_EfuseParseChnlPlan(struct adapter padapter, u8 hwinfo, bool AutoLoadFail)		void rtl8188e_EfuseParseChnlPlan(struct adapter padapter, u8 hwinfo, bool AutoLoadFail)
	@@ -861,8 +828,6 @@ void rtl8188e_EfuseParseChnlPlan(struct adapter padapter, u8 hwinfo, bool Auto
	hwinfo ? hwinfo[EEPROM_ChannelPlan_88E] : 0xFF,		hwinfo ? hwinfo[EEPROM_ChannelPlan_88E] : 0xFF,
	padapter->registrypriv.channel_plan,		padapter->registrypriv.channel_plan,
	RT_CHANNEL_DOMAIN_WORLD_WIDE_13, AutoLoadFail);		RT_CHANNEL_DOMAIN_WORLD_WIDE_13, AutoLoadFail);

	DBG_88E("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan);
	}		}

	void Hal_ReadAntennaDiversity88E(struct adapter pAdapter, u8 PROMContent, bool AutoLoadFail)		void Hal_ReadAntennaDiversity88E(struct adapter pAdapter, u8 PROMContent, bool AutoLoadFail)
	@@ -894,7 +859,6 @@ void Hal_ReadAntennaDiversity88E(struct adapter pAdapter, u8 PROMContent, bool
	} else {		} else {
	pHalData->AntDivCfg = 0;		pHalData->AntDivCfg = 0;
	}		}
	DBG_88E("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n", pHalData->AntDivCfg, pHalData->TRxAntDivType);
	}		}

	void Hal_ReadThermalMeter_88E(struct adapter Adapter, u8 PROMContent, bool AutoloadFail)		void Hal_ReadThermalMeter_88E(struct adapter Adapter, u8 PROMContent, bool AutoloadFail)
	@@ -909,6 +873,4 @@ void Hal_ReadThermalMeter_88E(struct adapter Adapter, u8 PROMContent, bool Aut

	if (pHalData->EEPROMThermalMeter == 0xff \|\| AutoloadFail)		if (pHalData->EEPROMThermalMeter == 0xff \|\| AutoloadFail)
	pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E;		pHalData->EEPROMThermalMeter = EEPROM_Default_ThermalMeter_88E;

	DBG_88E("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter);
	}		}

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -685,7 +685,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
	struct hal_data_8188e *pHalData = &Adapter->haldata;		struct hal_data_8188e *pHalData = &Adapter->haldata;

	if (Adapter->bNotifyChannelChange)		if (Adapter->bNotifyChannelChange)
	DBG_88E("[%s] ch = %d\n", __func__, channel);		;

	/* s1. pre common command - CmdID_SetTxPowerLevel */		/* s1. pre common command - CmdID_SetTxPowerLevel */
	PHY_SetTxPowerLevel8188E(Adapter, channel);		PHY_SetTxPowerLevel8188E(Adapter, channel);