Messages in this thread | | | Date | Sun, 25 Sep 2022 22:56:13 +0200 | Subject | Re: [PATCH v3] staging: rtl8192e: fix CamelCase struct member | From | Philipp Hortmann <> |
| |
On 9/25/22 14:23, Valentin Vidic wrote: > Fix checkpatch warnings for struct member pFirmware. This is too short description as you take out: struct rt_firmware *pfirmware = priv->pFirmware; And replace pfirmware with priv->firmware > > Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr> > --- > v2: drop the 'p' prefix from the struct member and always > use priv->firmware for access. > v3: rebase on staging-testing branch > > .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +++--- > .../rtl8192e/rtl8192e/r8192E_firmware.c | 25 ++++++++----------- > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 +++--- > drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- > 4 files changed, 20 insertions(+), 23 deletions(-) > > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c > index 5832ccdb4e50..54f5c7574f8a 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c > +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c > @@ -622,19 +622,19 @@ bool rtl92e_start_adapter(struct net_device *dev) > rtl92e_writeb(dev, ANAPAR, 0x37); > mdelay(500); > } > - priv->pFirmware->status = FW_STATUS_0_INIT; > + priv->firmware->status = FW_STATUS_0_INIT; > > if (priv->RegRfOff) > priv->rtllib->eRFPowerState = eRfOff; > > ulRegRead = rtl92e_readl(dev, CPU_GEN); > - if (priv->pFirmware->status == FW_STATUS_0_INIT) > + if (priv->firmware->status == FW_STATUS_0_INIT) > ulRegRead |= CPU_GEN_SYSTEM_RESET; > - else if (priv->pFirmware->status == FW_STATUS_5_READY) > + else if (priv->firmware->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->firmware->status); > > rtl92e_writel(dev, CPU_GEN, ulRegRead); > > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c > index 789d288d7503..b4b702623bfe 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c > +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c > @@ -51,32 +51,31 @@ 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; > bool rt_status = true; > > switch (load_fw_status) { > case FW_INIT_STEP0_BOOT: > - pfirmware->status = FW_STATUS_1_MOVE_BOOT_CODE; > + priv->firmware->status = FW_STATUS_1_MOVE_BOOT_CODE; > break; > > case FW_INIT_STEP1_MAIN: > - pfirmware->status = FW_STATUS_2_MOVE_MAIN_CODE; > + priv->firmware->status = FW_STATUS_2_MOVE_MAIN_CODE; > > rt_status = _rtl92e_fw_boot_cpu(dev); > if (rt_status) > - pfirmware->status = FW_STATUS_3_TURNON_CPU; > + priv->firmware->status = FW_STATUS_3_TURNON_CPU; > else > netdev_dbg(dev, "_rtl92e_fw_boot_cpu fail!\n"); > > break; > > case FW_INIT_STEP2_DATA: > - pfirmware->status = FW_STATUS_4_MOVE_DATA_CODE; > + priv->firmware->status = FW_STATUS_4_MOVE_DATA_CODE; > mdelay(1); > > rt_status = _rtl92e_wait_for_fw(dev, CPU_GEN_FIRM_RDY, 20); > if (rt_status) > - pfirmware->status = FW_STATUS_5_READY; > + priv->firmware->status = FW_STATUS_5_READY; > break; > default: > rt_status = false; > @@ -134,22 +133,20 @@ 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; > - > netdev_dbg(dev, " PlatformInitFirmware()==>\n"); > > - if (pfirmware->status == FW_STATUS_0_INIT) { > + if (priv->firmware->status == FW_STATUS_0_INIT) { > rst_opt = OPT_SYSTEM_RESET; > starting_state = FW_INIT_STEP0_BOOT; > > - } else if (pfirmware->status == FW_STATUS_5_READY) { > + } else if (priv->firmware->status == FW_STATUS_5_READY) { > rst_opt = OPT_FIRMWARE_RESET; > starting_state = FW_INIT_STEP2_DATA; > } > > for (i = starting_state; i <= FW_INIT_STEP2_DATA; i++) { > if (rst_opt == OPT_SYSTEM_RESET) { > - if (pfirmware->blobs[i].size == 0) { > + if (priv->firmware->blobs[i].size == 0) { > const char *fw_name[3] = { > RTL8192E_BOOT_IMG_FW, > RTL8192E_MAIN_IMG_FW, > @@ -161,15 +158,15 @@ bool rtl92e_init_fw(struct net_device *dev) > pad = 128; > > if (!_rtl92e_fw_prepare(dev, > - &pfirmware->blobs[i], > + &priv->firmware->blobs[i], > fw_name[i], > pad)) > goto download_firmware_fail; > } > } > > - mapped_file = pfirmware->blobs[i].data; > - file_length = pfirmware->blobs[i].size; > + mapped_file = priv->firmware->blobs[i].data; > + file_length = priv->firmware->blobs[i].size; > > rt_status = rtl92e_send_cmd_pkt(dev, DESC_PACKET_TYPE_INIT, > mapped_file, file_length); > diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > index 671fe547639b..94e8f0706ed4 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > @@ -907,8 +907,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->firmware = vzalloc(sizeof(*priv->firmware)); > + if (!priv->firmware) > netdev_err(dev, > "rtl8192e: Unable to allocate space for firmware\n"); > > @@ -2409,8 +2409,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->firmware); > + priv->firmware = 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 093887bcd463..dba789f0c9e6 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h > +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h > @@ -343,7 +343,7 @@ struct r8192_priv { > > enum acm_method AcmMethod; > > - struct rt_firmware *pFirmware; > + struct rt_firmware *firmware; > enum rtl819x_loopback LoopbackMode; > > struct timer_list watch_dog_timer;
A simple connection test works.
This patch cannot be applied on top of my 10 series patch send earlier. Sorry for that.
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
| |