Skip to content

L
linux
Commit 00731400 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8192e: Rename bHwRadioOff 

Rename variable bHwRadioOff to hw_radio_off to avoid CamelCase which is
not accepted by checkpatch.pl.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/bb977791e835310e51e9c38cc5c547e0b8a35e0c.1662402870.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43c64c06
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View file @ 00731400
......@@ -172,8 +172,8 @@ bool rtl92e_set_rf_state(struct net_device *dev,
case eRfOn:
priv->rtllib->RfOffReason &= (~change_source);
if ((change_source == RF_CHANGE_BY_HW) && priv->bHwRadioOff)
priv->bHwRadioOff = false;
if ((change_source == RF_CHANGE_BY_HW) && priv->hw_radio_off)
priv->hw_radio_off = false;
if (!priv->rtllib->RfOffReason) {
priv->rtllib->RfOffReason = 0;
......@@ -199,8 +199,8 @@ bool rtl92e_set_rf_state(struct net_device *dev,
WLAN_REASON_DISASSOC_STA_HAS_LEFT);
}
}
if ((change_source == RF_CHANGE_BY_HW) && !priv->bHwRadioOff)
priv->bHwRadioOff = true;
if ((change_source == RF_CHANGE_BY_HW) && !priv->hw_radio_off)
priv->hw_radio_off = true;
priv->rtllib->RfOffReason |= change_source;
action_allowed = true;
break;
......@@ -878,7 +878,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
memset(&priv->InterruptLog, 0, sizeof(struct log_int_8190));
priv->RxCounter = 0;
priv->rtllib->wx_set_enc = 0;
priv->bHwRadioOff = false;
priv->hw_radio_off = false;
priv->RegRfOff = false;
priv->isRFOff = false;
priv->bInPowerSaveMode = false;
......@@ -1292,7 +1292,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)
bool bHigherBusyRxTraffic = false;
bool bEnterPS = false;
if (!priv->up || priv->bHwRadioOff)
if (!priv->up || priv->hw_radio_off)
return;
if (priv->rtllib->state >= RTLLIB_LINKED) {
......
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
View file @ 00731400
......@@ -392,7 +392,7 @@ struct r8192_priv {
u16 ShortRetryLimit;
u16 LongRetryLimit;
bool bHwRadioOff;
bool hw_radio_off;
bool blinked_ingpio;
u8 polling_timer_on;
......
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file @ 00731400
......@@ -1819,15 +1819,15 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
eRfPowerStateToSet = (tmp1byte&BIT1) ? eRfOn : eRfOff;
if (priv->bHwRadioOff && (eRfPowerStateToSet == eRfOn)) {
if (priv->hw_radio_off && (eRfPowerStateToSet == eRfOn)) {
RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio ON\n");
netdev_info(dev, "gpiochangeRF - HW Radio ON\n");
priv->bHwRadioOff = false;
priv->hw_radio_off = false;
bActuallySet = true;
} else if (!priv->bHwRadioOff && (eRfPowerStateToSet == eRfOff)) {
} else if (!priv->hw_radio_off && (eRfPowerStateToSet == eRfOff)) {
RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio OFF\n");
netdev_info(dev, "gpiochangeRF - HW Radio OFF\n");
priv->bHwRadioOff = true;
priv->hw_radio_off = true;
bActuallySet = true;
}
......@@ -1835,7 +1835,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
mdelay(1000);
priv->bHwRfOffAction = 1;
rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
argv[1] = "RFOFF";
else
argv[1] = "RFON";
......
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
View file @ 00731400
......@@ -52,7 +52,7 @@ static int _rtl92e_wx_set_rate(struct net_device *dev,
int ret;
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -71,7 +71,7 @@ static int _rtl92e_wx_set_rts(struct net_device *dev,
int ret;
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -99,7 +99,7 @@ static int _rtl92e_wx_set_power(struct net_device *dev,
int ret;
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff) {
if (priv->hw_radio_off) {
netdev_warn(dev, "%s(): Can't set Power: Radio is Off.\n",
__func__);
return 0;
......@@ -129,7 +129,7 @@ static int _rtl92e_wx_set_rawtx(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
int ret;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -228,7 +228,7 @@ static int _rtl92e_wx_set_debug(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
u8 c = *extra;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
netdev_info(dev, "=====>%s(), *extra:%x, debugflag:%x\n", __func__,
......@@ -250,7 +250,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,
enum rt_rf_power_state rt_state;
int ret;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
rt_state = priv->rtllib->eRFPowerState;
mutex_lock(&priv->wx_mutex);
......@@ -391,7 +391,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
return 0;
}
if (priv->bHwRadioOff) {
if (priv->hw_radio_off) {
netdev_info(dev, "================>%s(): hwradio off\n",
__func__);
return 0;
......@@ -473,7 +473,7 @@ static int _rtl92e_wx_get_scan(struct net_device *dev,
if (!priv->up)
return -ENETDOWN;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -492,7 +492,7 @@ static int _rtl92e_wx_set_essid(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
int ret;
if (priv->bHwRadioOff) {
if (priv->hw_radio_off) {
netdev_info(dev,
"=========>%s():hw radio off,or Rf state is eRfOff, return\n",
__func__);
......@@ -560,7 +560,7 @@ static int _rtl92e_wx_set_freq(struct net_device *dev,
int ret;
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -586,7 +586,7 @@ static int _rtl92e_wx_set_frag(struct net_device *dev,
{
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
if (wrqu->frag.disabled)
......@@ -622,7 +622,7 @@ static int _rtl92e_wx_set_wap(struct net_device *dev,
int ret;
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -669,7 +669,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev,
{0x00, 0x00, 0x00, 0x00, 0x00, 0x03} };
int i;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
if (!priv->up)
......@@ -754,7 +754,7 @@ static int _rtl92e_wx_set_scan_type(struct net_device *dev,
int *parms = (int *)p;
int mode = parms[0];
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
priv->rtllib->active_scan = mode;
......@@ -770,7 +770,7 @@ static int _rtl92e_wx_set_retry(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
int err = 0;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -843,7 +843,7 @@ static int _rtl92e_wx_set_sens(struct net_device *dev,
short err = 0;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -870,7 +870,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib;
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -950,7 +950,7 @@ static int _rtl92e_wx_set_auth(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -967,7 +967,7 @@ static int _rtl92e_wx_set_mlme(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......@@ -984,7 +984,7 @@ static int _rtl92e_wx_set_gen_ie(struct net_device *dev,
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bHwRadioOff)
if (priv->hw_radio_off)
return 0;
mutex_lock(&priv->wx_mutex);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7