Commit b4412575 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename eeprom_CustomerID, SwChnlStage and SwChnlStep

Rename variable eeprom_CustomerID to eeprom_customer_id, SwChnlStage to
sw_chnl_stage and SwChnlStep to sw_chnl_step to avoid CamelCase which is
not accepted by checkpatch.
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/0d2e7bbd3a2f80d4652d4131c82294e172a2de30.1674336211.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5440dade
......@@ -303,7 +303,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
usValue = rtl92e_eeprom_read(dev,
(EEPROM_Customer_ID >> 1)) >> 8;
priv->eeprom_CustomerID = usValue & 0xff;
priv->eeprom_customer_id = usValue & 0xff;
usValue = rtl92e_eeprom_read(dev,
EEPROM_ICVersion_ChannelPlan>>1);
priv->eeprom_chnl_plan = usValue&0xff;
......@@ -327,7 +327,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
priv->card_8192_version = VERSION_8190_BD;
priv->eeprom_vid = 0;
priv->eeprom_did = 0;
priv->eeprom_CustomerID = 0;
priv->eeprom_customer_id = 0;
priv->eeprom_chnl_plan = 0;
}
......@@ -449,7 +449,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
priv->customer_id = RT_CID_DLINK;
switch (priv->eeprom_CustomerID) {
switch (priv->eeprom_customer_id) {
case EEPROM_CID_DEFAULT:
priv->customer_id = RT_CID_DEFAULT;
break;
......
......@@ -907,8 +907,8 @@ static void _rtl92e_phy_switch_channel(struct net_device *dev, u8 channel)
u32 delay = 0;
while (!_rtl92e_phy_switch_channel_step(dev, channel,
&priv->SwChnlStage,
&priv->SwChnlStep, &delay)) {
&priv->sw_chnl_stage,
&priv->sw_chnl_step, &delay)) {
if (delay > 0)
msleep(delay);
if (!priv->up)
......@@ -971,8 +971,8 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel)
priv->chan = channel;
priv->SwChnlStage = 0;
priv->SwChnlStep = 0;
priv->sw_chnl_stage = 0;
priv->sw_chnl_step = 0;
if (priv->up)
_rtl92e_phy_switch_channel_work_item(dev);
......
......@@ -417,7 +417,7 @@ struct r8192_priv {
short epromtype;
u16 eeprom_vid;
u16 eeprom_did;
u8 eeprom_CustomerID;
u8 eeprom_customer_id;
u16 eeprom_chnl_plan;
u8 eeprom_tx_pwr_level_cck[14];
......@@ -432,8 +432,8 @@ struct r8192_priv {
u8 thermal_meter[2];
u8 sw_chnl_in_progress;
u8 SwChnlStage;
u8 SwChnlStep;
u8 sw_chnl_stage;
u8 sw_chnl_step;
u8 set_bw_mode_in_progress;
u8 n_cur_40mhz_prime_sc;
......
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