diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2023-01-21 22:44:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-23 19:04:49 +0100 |
| commit | b441257594af2264ac2ce3dd7efb52c45cd73498 (patch) | |
| tree | c59135807e4a3c9b58ea27fd50001489f0a014b6 | |
| parent | 5440dade683e47c9b4478f2793c4df4bfe654732 (diff) | |
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: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/0d2e7bbd3a2f80d4652d4131c82294e172a2de30.1674336211.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index b721bb72007d..6c570582479d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -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; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 95a21859c7e0..ca10a14c63b4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -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); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index e0f4a3b444ee..55a68bbe3861 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -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; |