Commit 5b948401 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename rtl8192_phy_SetSwChnlCmdArray 



Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_SetSwChnlCmdArray to _rtl92e_phy_set_sw_chnl_cmd_array.

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

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+43 −31
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) 
	}

}



static u8 rtl8192_phy_SetSwChnlCmdArray(struct net_device *dev,

static u8 _rtl92e_phy_set_sw_chnl_cmd_array(struct net_device *dev,

					    struct sw_chnl_cmd *CmdTable,

					    u32 CmdTableIdx, u32 CmdTableSz,

					    enum sw_chnl_cmd_id CmdID,
@@ -842,19 +842,22 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 


	{

		PreCommonCmdCnt = 0;

		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd,

		_rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PreCommonCmd,

						  PreCommonCmdCnt++,

					MAX_PRECMD_CNT, CmdID_SetTxPowerLevel,

						  MAX_PRECMD_CNT,

						  CmdID_SetTxPowerLevel,

						  0, 0, 0);

		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd,

		_rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PreCommonCmd,

						  PreCommonCmdCnt++,

					MAX_PRECMD_CNT, CmdID_End, 0, 0, 0);

						  MAX_PRECMD_CNT, CmdID_End,

						  0, 0, 0);



		PostCommonCmdCnt = 0;



		rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PostCommonCmd,

		_rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PostCommonCmd,

						  PostCommonCmdCnt++,

					MAX_POSTCMD_CNT, CmdID_End, 0, 0, 0);

						  MAX_POSTCMD_CNT, CmdID_End,

						  0, 0, 0);



		RfDependCmdCnt = 0;

		switch (priv->rf_chip) {
@@ -865,12 +868,18 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
					   channel);

				return false;

			}

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

				CmdID_RF_WriteReg, rZebra1_Channel,

				RF_CHANNEL_TABLE_ZEBRA[channel], 10);

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

			_rtl92e_phy_set_sw_chnl_cmd_array(dev,

							  ieee->RfDependCmd,

							  RfDependCmdCnt++,

							  MAX_RFDEPENDCMD_CNT,

							  CmdID_RF_WriteReg,

							  rZebra1_Channel,

							  RF_CHANNEL_TABLE_ZEBRA[channel],

							  10);

			_rtl92e_phy_set_sw_chnl_cmd_array(dev,

							  ieee->RfDependCmd,

							  RfDependCmdCnt++,

							  MAX_RFDEPENDCMD_CNT,

							  CmdID_End, 0, 0, 0);

			break;
@@ -881,12 +890,15 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
					   channel);

				return false;

			}

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,

				 RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT,

				CmdID_RF_WriteReg, rZebra1_Channel, channel,

				 10);

			rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd,



			_rtl92e_phy_set_sw_chnl_cmd_array(dev,

							  ieee->RfDependCmd,

							  RfDependCmdCnt++,

							  MAX_RFDEPENDCMD_CNT,

							  CmdID_RF_WriteReg,

							  rZebra1_Channel,

							  channel, 10);

			_rtl92e_phy_set_sw_chnl_cmd_array(dev,

							  ieee->RfDependCmd,

							  RfDependCmdCnt++,

							  MAX_RFDEPENDCMD_CNT,

							  CmdID_End, 0, 0, 0);