staging: rtl8192e: Rename LastRxDescTSF, LoopbackMode and pFirmware

Rename variable LastRxDescTSF to last_rx_desc_tsf, LoopbackMode to
loopback_mode and pFirmware to fw_info 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/d6c77644d5602ad6e5b4889336a1a4700401321d.1674071236.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index b0f33fbffa42cfffb14cce6da5ee604aea1c53b5..a0678c6bac72c208e5568457abe889ca385fc575 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -619,16 +619,16 @@ start:
                rtl92e_writeb(dev, ANAPAR, 0x37);
                mdelay(500);
        }
-       priv->pFirmware->status = FW_STATUS_0_INIT;
+       priv->fw_info->status = FW_STATUS_0_INIT;
 
        ulRegRead = rtl92e_readl(dev, CPU_GEN);
-       if (priv->pFirmware->status == FW_STATUS_0_INIT)
+       if (priv->fw_info->status == FW_STATUS_0_INIT)
                ulRegRead |= CPU_GEN_SYSTEM_RESET;
-       else if (priv->pFirmware->status == FW_STATUS_5_READY)
+       else if (priv->fw_info->status == FW_STATUS_5_READY)
                ulRegRead |= CPU_GEN_FIRMWARE_RESET;
        else
                netdev_err(dev, "%s(): undefined firmware state: %d.\n",
-                          __func__, priv->pFirmware->status);
+                          __func__, priv->fw_info->status);
 
        rtl92e_writel(dev, CPU_GEN, ulRegRead);
 
@@ -647,13 +647,13 @@ start:
                return rtStatus;
        }
 
-       priv->LoopbackMode = RTL819X_NO_LOOPBACK;
+       priv->loopback_mode = RTL819X_NO_LOOPBACK;
        if (priv->rst_progress == RESET_TYPE_NORESET) {
                ulRegRead = rtl92e_readl(dev, CPU_GEN);
-               if (priv->LoopbackMode == RTL819X_NO_LOOPBACK)
+               if (priv->loopback_mode == RTL819X_NO_LOOPBACK)
                        ulRegRead = (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) |
                                    CPU_GEN_NO_LOOPBACK_SET;
-               else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
+               else if (priv->loopback_mode == RTL819X_MAC_LOOPBACK)
                        ulRegRead |= CPU_CCK_LOOPBACK;
                else
                        netdev_err(dev, "%s: Invalid loopback mode setting.\n",

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 789d288d75037810926fbe06fe3f3fa7dcc8cb2a..b011ec8c8a4115f5eec921bfc54bd80d346761fd 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -51,7 +51,7 @@ static bool _rtl92e_fw_check_ready(struct net_device *dev,
                                   u8 load_fw_status)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       struct rt_firmware *pfirmware = priv->pFirmware;
+       struct rt_firmware *pfirmware = priv->fw_info;
        bool rt_status  = true;
 
        switch (load_fw_status) {
@@ -134,7 +134,7 @@ bool rtl92e_init_fw(struct net_device *dev)
        enum opt_rst_type rst_opt = OPT_SYSTEM_RESET;
        enum firmware_init_step starting_state = FW_INIT_STEP0_BOOT;
 
-       struct rt_firmware *pfirmware = priv->pFirmware;
+       struct rt_firmware *pfirmware = priv->fw_info;
 
        netdev_dbg(dev, " PlatformInitFirmware()==>\n");
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 8e1180b75d386578dd6b36aa637d7022aecf285a..7a89381bae50dbe6abbd7fcee9999b037ff7051a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -891,8 +891,8 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 
        priv->card_type = PCI;
 
-       priv->pFirmware = vzalloc(sizeof(struct rt_firmware));
-       if (!priv->pFirmware)
+       priv->fw_info = vzalloc(sizeof(struct rt_firmware));
+       if (!priv->fw_info)
                netdev_err(dev,
                           "rtl8192e: Unable to allocate space for firmware\n");
 
@@ -1807,9 +1807,9 @@ void rtl92e_update_rx_pkt_timestamp(struct net_device *dev,
        struct r8192_priv *priv = rtllib_priv(dev);
 
        if (stats->bIsAMPDU && !stats->bFirstMPDU)
-               stats->mac_time = priv->LastRxDescTSF;
+               stats->mac_time = priv->last_rx_desc_tsf;
        else
-               priv->LastRxDescTSF = stats->mac_time;
+               priv->last_rx_desc_tsf = stats->mac_time;
 }
 
 long rtl92e_translate_to_dbm(struct r8192_priv *priv, u8 signal_strength_index)
@@ -2386,8 +2386,8 @@ static void _rtl92e_pci_disconnect(struct pci_dev *pdev)
                priv->polling_timer_on = 0;
                _rtl92e_down(dev, true);
                rtl92e_dm_deinit(dev);
-               vfree(priv->pFirmware);
-               priv->pFirmware = NULL;
+               vfree(priv->fw_info);
+               priv->fw_info = NULL;
                _rtl92e_free_rx_ring(dev);
                for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
                        _rtl92e_free_tx_ring(dev, i);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 8de726de57f40866d5f29c8322e9769d1eefe428..da10835a987e4f24f7b7d532ed46b5c6f1356a6d 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -325,8 +325,8 @@ struct r8192_priv {
        struct bb_reg_definition PHYRegDef[4];
        struct rate_adaptive rate_adaptive;
 
-       struct rt_firmware                      *pFirmware;
-       enum rtl819x_loopback LoopbackMode;
+       struct rt_firmware *fw_info;
+       enum rtl819x_loopback loopback_mode;
 
        struct timer_list                       watch_dog_timer;
        struct timer_list                       fsync_timer;
@@ -360,7 +360,7 @@ struct r8192_priv {
        int             rxringcount;
        u16             rxbuffersize;
 
-       u64             LastRxDescTSF;
+       u64 last_rx_desc_tsf;
 
        u32 receive_config;
        u8              retry_data;