Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b4140af authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Replace RT_TRACE(COMP_ERR, ...) with netdev_* 



- Use netdev_* with log level depending on how serious error is
- Rework some messages to be more readable
- Pass net_device where needed for pretty prints

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 156b80db

drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c

+11 −13
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, 
						0x0e, bMask12Bits, 0x021);



			} else {

				RT_TRACE(COMP_ERR,

					 "PHY_SetRF8256Bandwidth(): unknown hardware version\n");

				netdev_warn(dev, "%s(): Unknown HW version.\n",

					    __func__);

			}



			break;
@@ -66,16 +66,15 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, 
						 0x0e, bMask12Bits, 0x0e1);



			} else {

				RT_TRACE(COMP_ERR,

					 "PHY_SetRF8256Bandwidth(): unknown hardware version\n");

				netdev_warn(dev, "%s(): Unknown HW version.\n",

					    __func__);

			}





			break;

		default:

			RT_TRACE(COMP_ERR,

				 "PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n",

				 Bandwidth);

			netdev_err(dev, "%s(): Unknown bandwidth: %#X\n",

				   __func__, Bandwidth);

			break;



		}
@@ -139,9 +138,8 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) 
		rtStatus = rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF,

						(enum rf90_radio_path)eRFPath);

		if (!rtStatus) {

			RT_TRACE(COMP_ERR,

				 "PHY_RF8256_Config():Check Radio[%d] Fail!!\n",

				 eRFPath);

			netdev_err(dev, "%s(): Failed to check RF Path %d.\n",

				   __func__, eRFPath);

			goto phy_RF8256_Config_ParaFile_Fail;

		}
@@ -227,9 +225,9 @@ bool phy_RF8256_Config_ParaFile(struct net_device *dev) 
		}



		if (ret) {

			RT_TRACE(COMP_ERR,

				 "phy_RF8256_Config_ParaFile():Radio[%d] Fail!!",

				 eRFPath);

			netdev_err(dev,

				   "%s(): Failed to initialize RF Path %d.\n",

				   __func__, eRFPath);

			goto phy_RF8256_Config_ParaFile_Fail;

		}

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+15 −16
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ static void rtl8192_read_eeprom_info(struct net_device *dev) 


	EEPROMId = eprom_read(dev, 0);

	if (EEPROMId != RTL8190_EEPROM_ID) {

		RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n",

			 EEPROMId, RTL8190_EEPROM_ID);

		netdev_err(dev, "%s(): Invalid EEPROM ID: %x\n", __func__,

			   EEPROMId);

		priv->AutoloadFailFlag = true;

	} else {

		priv->AutoloadFailFlag = false;
@@ -736,8 +736,7 @@ bool rtl8192_adapter_start(struct net_device *dev) 
	else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)

		ulRegRead |= CPU_GEN_FIRMWARE_RESET;

	else

		RT_TRACE(COMP_ERR,

			 "ERROR in %s(): undefined firmware state(%d)\n",

		netdev_err(dev, "%s(): undefined firmware state: %d.\n",

			   __func__, priv->pFirmware->firmware_status);



	write_nic_dword(dev, CPU_GEN, ulRegRead);
@@ -754,7 +753,7 @@ bool rtl8192_adapter_start(struct net_device *dev) 
	RT_TRACE(COMP_INIT, "BB Config Start!\n");

	rtStatus = rtl8192_BBConfig(dev);

	if (!rtStatus) {

		RT_TRACE(COMP_ERR, "BB Config failed\n");

		netdev_warn(dev, "%s(): Failed to configure BB\n", __func__);

		return rtStatus;

	}

	RT_TRACE(COMP_INIT, "BB Config Finished!\n");
@@ -768,8 +767,8 @@ bool rtl8192_adapter_start(struct net_device *dev) 
		else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)

			ulRegRead |= CPU_CCK_LOOPBACK;

		else

			RT_TRACE(COMP_ERR,

				 "Serious error: wrong loopback mode setting\n");

			netdev_err(dev, "%s: Invalid loopback mode setting.\n",

				   __func__);



		write_nic_dword(dev, CPU_GEN, ulRegRead);
@@ -867,7 +866,7 @@ bool rtl8192_adapter_start(struct net_device *dev) 
		RT_TRACE(COMP_INIT, "RF Config Started!\n");

		rtStatus = rtl8192_phy_RFConfig(dev);

		if (!rtStatus) {

			RT_TRACE(COMP_ERR, "RF Config failed\n");

			netdev_info(dev, "RF Config failed\n");

			return rtStatus;

		}

		RT_TRACE(COMP_INIT, "RF Config Finished!\n");
@@ -1137,7 +1136,8 @@ static u8 MRateToHwRate8190Pci(u8 rate) 
	return ret;

}



static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)

static u8 rtl8192_MapHwQueueToFirmwareQueue(struct net_device *dev, u8 QueueID,

					    u8 priority)

{

	u8 QueueSelect = 0x0;
@@ -1170,9 +1170,8 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority) 
		QueueSelect = QSLT_HIGH;

		break;

	default:

		RT_TRACE(COMP_ERR,

			 "TransmitTCB(): Impossible Queue Selection: %d\n",

			 QueueID);

		netdev_warn(dev, "%s(): Impossible Queue Selection: %d\n",

			    __func__, QueueID);

		break;

	}

	return QueueSelect;
@@ -1196,7 +1195,7 @@ void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc, 
						cb_desc);



	if (pci_dma_mapping_error(priv->pdev, mapping))

		RT_TRACE(COMP_ERR, "DMA Mapping error\n");

		netdev_err(dev, "%s(): DMA Mapping error\n", __func__);

	if (cb_desc->bAMPDUEnable) {

		pTxFwInfo->AllowAggregation = 1;

		pTxFwInfo->RxMF = cb_desc->ampdu_factor;
@@ -1272,7 +1271,7 @@ void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc, 


	pdesc->PktId = 0x0;



	pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(

	pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(dev,

						cb_desc->queue_index,

						cb_desc->priority);

	pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
@@ -1296,7 +1295,7 @@ void rtl8192_tx_fill_cmd_desc(struct net_device *dev, 
			 PCI_DMA_TODEVICE);



	if (pci_dma_mapping_error(priv->pdev, mapping))

		RT_TRACE(COMP_ERR, "DMA Mapping error\n");

		netdev_err(dev, "%s(): DMA Mapping error\n", __func__);

	memset(entry, 0, 12);

	entry->LINIP = cb_desc->bLastIniPkt;

	entry->FirstSeg = 1;

drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c

+7 −6
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
	}



	if (!(CPU_status&CPU_GEN_PUT_CODE_OK)) {

		RT_TRACE(COMP_ERR, "Download Firmware: Put code fail!\n");

		netdev_err(dev, "Firmware download failed.\n");

		goto CPUCheckMainCodeOKAndTurnOnCPU_Fail;

	} else {

		RT_TRACE(COMP_FIRMWARE, "Download Firmware: Put code ok!\n");
@@ -135,15 +135,16 @@ static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) 
		mdelay(2);

	}



	if (!(CPU_status&CPU_GEN_BOOT_RDY))

	if (!(CPU_status&CPU_GEN_BOOT_RDY)) {

		netdev_err(dev, "Firmware boot failed.\n");

		goto CPUCheckMainCodeOKAndTurnOnCPU_Fail;

	else

	}



	RT_TRACE(COMP_FIRMWARE, "Download Firmware: Boot ready!\n");



	return rt_status;



CPUCheckMainCodeOKAndTurnOnCPU_Fail:

	RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);

	rt_status = false;

	return rt_status;

}
@@ -310,7 +311,7 @@ bool init_firmware(struct net_device *dev) 
	return rt_status;



download_firmware_fail:

	RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__);

	netdev_err(dev, "%s: Failed to initialize firmware.\n", __func__);

	rt_status = false;

	return rt_status;

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+48 −52
Original line number Diff line number Diff line
@@ -539,9 +539,7 @@ bool rtl8192_phy_checkBBAndRF(struct net_device *dev, 




		if (dwRegRead != WriteData[i]) {

			RT_TRACE(COMP_ERR,

				 "====>error=====dwRegRead: %x, WriteData: %x\n",

				 dwRegRead, WriteData[i]);

			netdev_warn(dev, "%s(): Check failed.\n", __func__);

			ret = false;

			break;

		}
@@ -687,8 +685,7 @@ void rtl8192_phy_setTxPower(struct net_device *dev, u8 channel) 
	case RF_8258:

		break;

	default:

		RT_TRACE(COMP_ERR, "unknown rf chip in function %s()\n",

			 __func__);

		netdev_err(dev, "Invalid RF Chip ID.\n");

		break;

	}

}
@@ -711,7 +708,7 @@ bool rtl8192_phy_RFConfig(struct net_device *dev) 
		break;



	default:

		RT_TRACE(COMP_ERR, "error chip id\n");

		netdev_err(dev, "Invalid RF Chip ID.\n");

		break;

	}

	return rtStatus;
@@ -804,13 +801,13 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) 
	case RF_8258:

		break;

	default:

		RT_TRACE(COMP_ERR,

			 "unknown rf chip ID in rtl8192_SetTxPowerLevel()\n");

		netdev_warn(dev, "%s(): Invalid RF Chip ID\n", __func__);

		break;

	}

}



static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable,

static u8 rtl8192_phy_SetSwChnlCmdArray(struct net_device *dev,

					struct sw_chnl_cmd *CmdTable,

					u32 CmdTableIdx, u32 CmdTableSz,

					enum sw_chnl_cmd_id CmdID,

					u32 Para1, u32 Para2, u32 msDelay)
@@ -818,14 +815,11 @@ static u8 rtl8192_phy_SetSwChnlCmdArray(struct sw_chnl_cmd *CmdTable, 
	struct sw_chnl_cmd *pCmd;



	if (CmdTable == NULL) {

		RT_TRACE(COMP_ERR,

			 "phy_SetSwChnlCmdArray(): CmdTable cannot be NULL.\n");

		netdev_err(dev, "%s(): CmdTable cannot be NULL.\n", __func__);

		return false;

	}

	if (CmdTableIdx >= CmdTableSz) {

		RT_TRACE(COMP_ERR,

			 "phy_SetSwChnlCmdArray(): Access invalid index, please check size of the table, CmdTableIdx:%d, CmdTableSz:%d\n",

			 CmdTableIdx, CmdTableSz);

		netdev_err(dev, "%s(): Invalid index requested.\n", __func__);

		return false;

	}
@@ -853,24 +847,23 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
		  __func__, *stage, *step, channel);



	if (!rtllib_legal_channel(priv->rtllib, channel)) {

		RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n",

			 channel);

		netdev_err(dev, "Invalid channel requested: %d\n", channel);

		return true;

	}



	{

		PreCommonCmdCnt = 0;

		rtl8192_phy_SetSwChnlCmdArray(ieee->PreCommonCmd,

		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd,

					PreCommonCmdCnt++,

					MAX_PRECMD_CNT, CmdID_SetTxPowerLevel,

					0, 0, 0);

		rtl8192_phy_SetSwChnlCmdArray(ieee->PreCommonCmd,

		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd,

					PreCommonCmdCnt++,

					MAX_PRECMD_CNT, CmdID_End, 0, 0, 0);



		PostCommonCmdCnt = 0;



		rtl8192_phy_SetSwChnlCmdArray(ieee->PostCommonCmd,

		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PostCommonCmd,

					PostCommonCmdCnt++,

					MAX_POSTCMD_CNT, CmdID_End, 0, 0, 0);
@@ -878,32 +871,32 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
		switch (priv->rf_chip) {

		case RF_8225:

			if (!(channel >= 1 && channel <= 14)) {

				RT_TRACE(COMP_ERR,

					 "illegal channel for Zebra 8225: %d\n",

				netdev_err(dev,

					   "Invalid channel requested for 8225: %d\n",

					   channel);

				return false;

			}

			rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

				CmdID_RF_WriteReg, rZebra1_Channel,

				RF_CHANNEL_TABLE_ZEBRA[channel], 10);

			rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

				CmdID_End, 0, 0, 0);

			break;



		case RF_8256:

			if (!(channel >= 1 && channel <= 14)) {

				RT_TRACE(COMP_ERR,

					 "illegal channel for Zebra 8256: %d\n",

				netdev_err(dev,

					   "Invalid channel requested for 8256: %d\n",

					   channel);

				return false;

			}

			rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				 RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

				CmdID_RF_WriteReg, rZebra1_Channel, channel,

				 10);

			rtl8192_phy_SetSwChnlCmdArray(ieee->RfDependCmd,

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,



						      RfDependCmdCnt++,

						      MAX_RFDEPENDCMD_CNT,
@@ -914,8 +907,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
			break;



		default:

			RT_TRACE(COMP_ERR, "Unknown RFChipID: %d\n",

				 priv->rf_chip);

			netdev_warn(dev, "Unknown RF Chip ID\n");

			return false;

		}
@@ -1015,7 +1007,7 @@ u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel) 


	RT_TRACE(COMP_PHY, "=====>%s()\n", __func__);

	if (!priv->up) {

		RT_TRACE(COMP_ERR, "%s(): ERR !! driver is not up\n", __func__);

		netdev_err(dev, "%s(): Driver is not initialized\n", __func__);

		return false;

	}

	if (priv->SwChnlInProgress)
@@ -1026,20 +1018,26 @@ u8 rtl8192_phy_SwChnl(struct net_device *dev, u8 channel) 
	case WIRELESS_MODE_A:

	case WIRELESS_MODE_N_5G:

		if (channel <= 14) {

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_A but channel<=14");

			netdev_warn(dev,

				    "Channel %d not available in 802.11a.\n",

				    channel);

			return false;

		}

		break;

	case WIRELESS_MODE_B:

		if (channel > 14) {

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_B but channel>14");

			netdev_warn(dev,

				    "Channel %d not available in 802.11b.\n",

				    channel);

			return false;

		}

		break;

	case WIRELESS_MODE_G:

	case WIRELESS_MODE_N_24G:

		if (channel > 14) {

			RT_TRACE(COMP_ERR, "WIRELESS_MODE_G but channel>14");

			netdev_warn(dev,

				    "Channel %d not available in 802.11g.\n",

				    channel);

			return false;

		}

		break;
@@ -1182,7 +1180,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) 
		return;

	}

	if (!priv->up) {

		RT_TRACE(COMP_ERR, "%s(): ERR!! driver is not up\n", __func__);

		netdev_err(dev, "%s(): Driver is not initialized\n", __func__);

		return;

	}

	regBwOpMode = read_nic_byte(dev, BW_OPMODE);
@@ -1199,8 +1197,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) 
		break;



	default:

		RT_TRACE(COMP_ERR,

			 "SetChannelBandwidth819xUsb(): unknown Bandwidth: %#X\n",

		netdev_err(dev, "%s(): unknown Bandwidth: %#X\n", __func__,

			   priv->CurrentChannelBW);

		break;

	}
@@ -1241,8 +1238,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) 
		rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x00100000, 0);

		break;

	default:

		RT_TRACE(COMP_ERR,

			 "SetChannelBandwidth819xUsb(): unknown Bandwidth: %#X\n",

		netdev_err(dev, "%s(): unknown Bandwidth: %#X\n", __func__,

			   priv->CurrentChannelBW);

		break;
@@ -1263,7 +1259,8 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev) 
		break;



	default:

		RT_TRACE(COMP_ERR, "Unknown RFChipID: %d\n", priv->rf_chip);

		netdev_info(dev, "%s(): Unknown RFChipID: %d\n", __func__,

			    priv->rf_chip);

		break;

	}
@@ -1454,8 +1451,8 @@ static bool SetRFPowerState8190(struct net_device *dev, 
				} while (!rtstatus && (InitilizeCount > 0));



				if (!rtstatus) {

					RT_TRACE(COMP_ERR,

						 "%s():Initialize Adapter fail,return\n",

					netdev_err(dev,

						   "%s(): Failed to initialize Adapter.\n",

						   __func__);

					priv->SetRFPowerStateInProgress = false;

					return false;
@@ -1557,16 +1554,16 @@ static bool SetRFPowerState8190(struct net_device *dev, 


		default:

			bResult = false;

			RT_TRACE(COMP_ERR,

				 "SetRFPowerState8190(): unknown state to set: 0x%X!!!\n",

				 eRFPowerState);

			netdev_warn(dev,

				    "%s(): Unknown state requested: 0x%X.\n",

				    __func__, eRFPowerState);

			break;

		}



		break;



	default:

		RT_TRACE(COMP_ERR, "SetRFPowerState8190(): Unknown RF type\n");

		netdev_warn(dev, "%s(): Unknown RF type\n", __func__);

		break;

	}
@@ -1578,8 +1575,7 @@ static bool SetRFPowerState8190(struct net_device *dev, 
			break;



		default:

			RT_TRACE(COMP_ERR,

				 "SetRFPowerState8190(): Unknown RF type\n");

			netdev_warn(dev, "%s(): Unknown RF type\n", __func__);

			break;

		}

	}

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+9 −9
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, 
	if (priv->rtllib->PowerSaveControl.bInactivePs) {

		if (rtState == eRfOff) {

			if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) {

				RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",

				netdev_warn(dev, "%s(): RF is OFF.\n",

					    __func__);

				return;

			}
@@ -124,7 +124,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, 
	}

	priv->rtllib->is_set_key = true;

	if (EntryNo >= TOTAL_CAM_ENTRY)

		RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");

		netdev_info(dev, "%s(): Invalid CAM entry\n", __func__);



	RT_TRACE(COMP_SEC,

		 "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,KeyType:%d, MacAddr %pM\n",
@@ -243,8 +243,8 @@ void CamRestoreAllEntry(struct net_device *dev) 
				       (u32 *)(&priv->rtllib->swcamtable[0].key_buf[0])

				     );

			} else {

				RT_TRACE(COMP_ERR,

					 "===>%s():ERR!! ADHOC TKIP ,but 0 entry is have no data\n",

				netdev_warn(dev,

					    "%s(): ADHOC TKIP: missing key entry.\n",

					    __func__);

				return;

			}
@@ -267,8 +267,8 @@ void CamRestoreAllEntry(struct net_device *dev) 
					CAM_CONST_ADDR[0], 0,

					(u32 *)(&priv->rtllib->swcamtable[0].key_buf[0]));

			} else {

				RT_TRACE(COMP_ERR,

					 "===>%s():ERR!! ADHOC CCMP ,but 0 entry is have no data\n",

				netdev_warn(dev,

					    "%s(): ADHOC CCMP: missing key entry.\n",

					    __func__);

				return;

			}