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

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
...@@ -795,11 +795,11 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel) ...@@ -795,11 +795,11 @@ 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, struct sw_chnl_cmd *CmdTable,
u32 CmdTableIdx, u32 CmdTableSz, u32 CmdTableIdx, u32 CmdTableSz,
enum sw_chnl_cmd_id CmdID, enum sw_chnl_cmd_id CmdID,
u32 Para1, u32 Para2, u32 msDelay) u32 Para1, u32 Para2, u32 msDelay)
{ {
struct sw_chnl_cmd *pCmd; struct sw_chnl_cmd *pCmd;
...@@ -842,19 +842,22 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -842,19 +842,22 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
{ {
PreCommonCmdCnt = 0; PreCommonCmdCnt = 0;
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd, _rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PreCommonCmd,
PreCommonCmdCnt++, PreCommonCmdCnt++,
MAX_PRECMD_CNT, CmdID_SetTxPowerLevel, MAX_PRECMD_CNT,
0, 0, 0); CmdID_SetTxPowerLevel,
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PreCommonCmd, 0, 0, 0);
PreCommonCmdCnt++, _rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PreCommonCmd,
MAX_PRECMD_CNT, CmdID_End, 0, 0, 0); PreCommonCmdCnt++,
MAX_PRECMD_CNT, CmdID_End,
0, 0, 0);
PostCommonCmdCnt = 0; PostCommonCmdCnt = 0;
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->PostCommonCmd, _rtl92e_phy_set_sw_chnl_cmd_array(dev, ieee->PostCommonCmd,
PostCommonCmdCnt++, PostCommonCmdCnt++,
MAX_POSTCMD_CNT, CmdID_End, 0, 0, 0); MAX_POSTCMD_CNT, CmdID_End,
0, 0, 0);
RfDependCmdCnt = 0; RfDependCmdCnt = 0;
switch (priv->rf_chip) { switch (priv->rf_chip) {
...@@ -865,13 +868,19 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -865,13 +868,19 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
channel); channel);
return false; return false;
} }
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd, _rtl92e_phy_set_sw_chnl_cmd_array(dev,
RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, ieee->RfDependCmd,
CmdID_RF_WriteReg, rZebra1_Channel, RfDependCmdCnt++,
RF_CHANNEL_TABLE_ZEBRA[channel], 10); MAX_RFDEPENDCMD_CNT,
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd, CmdID_RF_WriteReg,
RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, rZebra1_Channel,
CmdID_End, 0, 0, 0); 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; break;
case RF_8256: case RF_8256:
...@@ -881,15 +890,18 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, ...@@ -881,15 +890,18 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
channel); channel);
return false; return false;
} }
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd, _rtl92e_phy_set_sw_chnl_cmd_array(dev,
RfDependCmdCnt++, MAX_RFDEPENDCMD_CNT, ieee->RfDependCmd,
CmdID_RF_WriteReg, rZebra1_Channel, channel, RfDependCmdCnt++,
10); MAX_RFDEPENDCMD_CNT,
rtl8192_phy_SetSwChnlCmdArray(dev, ieee->RfDependCmd, CmdID_RF_WriteReg,
rZebra1_Channel,
RfDependCmdCnt++, channel, 10);
MAX_RFDEPENDCMD_CNT, _rtl92e_phy_set_sw_chnl_cmd_array(dev,
CmdID_End, 0, 0, 0); ieee->RfDependCmd,
RfDependCmdCnt++,
MAX_RFDEPENDCMD_CNT,
CmdID_End, 0, 0, 0);
break; break;
case RF_8258: case RF_8258:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment