From nobody Thu Apr 2 13:30:32 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E58ECC04A95 for ; Sun, 25 Sep 2022 12:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232081AbiIYMYF (ORCPT ); Sun, 25 Sep 2022 08:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229525AbiIYMYC (ORCPT ); Sun, 25 Sep 2022 08:24:02 -0400 Received: from valentin-vidic.from.hr (valentin-vidic.from.hr [IPv6:2001:470:1f0b:3b7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD94031DDD for ; Sun, 25 Sep 2022 05:23:59 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at valentin-vidic.from.hr Received: by valentin-vidic.from.hr (Postfix, from userid 1000) id E8DE127603; Sun, 25 Sep 2022 14:23:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=valentin-vidic.from.hr; s=2020; t=1664108631; bh=2JSYXMSMBEigXqbWYJP6Mn64kLyeNXIfMYpVNDbnc6Y=; h=From:To:Cc:Subject:Date:From; b=Kn3lUCAM4J3Ox8PrcT47nycKh9KVJFmMphXe0RfOd8SLy62KH1nyaKJBe40eSLZjP ucOgWvVOmKOCa7rAmjxATnS1LMNrEDQ+44qwe2+Xj0Wh5ncFLOM8DqOFpWJf+RHOk7 5Yh8p2Pj818uYNPTbbc5OfcAc2iJNLkd4acRpMRzqOMhb1AXN8BctkP9toUkb6lRX5 sQ3rB7lyb7P8jlF9q9b9r3JDXWFwM+YSV8Kqe8i9a0/duEF8KzcX83fASd6U6nocyw xWzx3eCsqdLyhLfIne3qNEAQAtViP/S2GtR07lMN09c0enrbFjGV7gXgSfpm9cNUYb xqzTyVHTquV7Jd1aC3OouBS/X2dTt58ztf2zKt3Ny7UdN7HNGILcUQouaftrA1NoIg vxTlctEzzGz3Iw4sGzDQ4tu235j41WB79nLH+imEHlgdutv1nnkoPetuClAqmnD9FT EowDZDXcsrCPlihukd5diOJ50xNegIb3kog3YqK8ubIMRhcSPqqdmAMxH2fnHP2twP Ok7/AiTpfgiePYzvMsSmtoJr3llqesyKpWu8Peqvav46Cvd+V/ma9coGX3S1oJpYSJ yYd5y34wP17Jy5vfiabdCD+wXbgePelkvcv65QrwuRk3U3FTuCD+pRbbcKkoINiIuJ Nz7Z80oCuqKgC8dAMfstear8= From: Valentin Vidic To: Greg Kroah-Hartman Cc: Philipp Hortmann , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Valentin Vidic Subject: [PATCH v3] staging: rtl8192e: fix CamelCase struct member Date: Sun, 25 Sep 2022 14:23:35 +0200 Message-Id: <20220925122335.2489902-1-vvidic@valentin-vidic.from.hr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix checkpatch warnings for struct member pFirmware. Signed-off-by: Valentin Vidic Tested-by: Philipp Hortmann --- 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/stagi= ng/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 =3D FW_STATUS_0_INIT; + priv->firmware->status =3D FW_STATUS_0_INIT; =20 if (priv->RegRfOff) priv->rtllib->eRFPowerState =3D eRfOff; =20 ulRegRead =3D rtl92e_readl(dev, CPU_GEN); - if (priv->pFirmware->status =3D=3D FW_STATUS_0_INIT) + if (priv->firmware->status =3D=3D FW_STATUS_0_INIT) ulRegRead |=3D CPU_GEN_SYSTEM_RESET; - else if (priv->pFirmware->status =3D=3D FW_STATUS_5_READY) + else if (priv->firmware->status =3D=3D FW_STATUS_5_READY) ulRegRead |=3D CPU_GEN_FIRMWARE_RESET; else netdev_err(dev, "%s(): undefined firmware state: %d.\n", - __func__, priv->pFirmware->status); + __func__, priv->firmware->status); =20 rtl92e_writel(dev, CPU_GEN, ulRegRead); =20 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 *d= ev, u8 load_fw_status) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_firmware *pfirmware =3D priv->pFirmware; bool rt_status =3D true; =20 switch (load_fw_status) { case FW_INIT_STEP0_BOOT: - pfirmware->status =3D FW_STATUS_1_MOVE_BOOT_CODE; + priv->firmware->status =3D FW_STATUS_1_MOVE_BOOT_CODE; break; =20 case FW_INIT_STEP1_MAIN: - pfirmware->status =3D FW_STATUS_2_MOVE_MAIN_CODE; + priv->firmware->status =3D FW_STATUS_2_MOVE_MAIN_CODE; =20 rt_status =3D _rtl92e_fw_boot_cpu(dev); if (rt_status) - pfirmware->status =3D FW_STATUS_3_TURNON_CPU; + priv->firmware->status =3D FW_STATUS_3_TURNON_CPU; else netdev_dbg(dev, "_rtl92e_fw_boot_cpu fail!\n"); =20 break; =20 case FW_INIT_STEP2_DATA: - pfirmware->status =3D FW_STATUS_4_MOVE_DATA_CODE; + priv->firmware->status =3D FW_STATUS_4_MOVE_DATA_CODE; mdelay(1); =20 rt_status =3D _rtl92e_wait_for_fw(dev, CPU_GEN_FIRM_RDY, 20); if (rt_status) - pfirmware->status =3D FW_STATUS_5_READY; + priv->firmware->status =3D FW_STATUS_5_READY; break; default: rt_status =3D false; @@ -134,22 +133,20 @@ bool rtl92e_init_fw(struct net_device *dev) enum opt_rst_type rst_opt =3D OPT_SYSTEM_RESET; enum firmware_init_step starting_state =3D FW_INIT_STEP0_BOOT; =20 - struct rt_firmware *pfirmware =3D priv->pFirmware; - netdev_dbg(dev, " PlatformInitFirmware()=3D=3D>\n"); =20 - if (pfirmware->status =3D=3D FW_STATUS_0_INIT) { + if (priv->firmware->status =3D=3D FW_STATUS_0_INIT) { rst_opt =3D OPT_SYSTEM_RESET; starting_state =3D FW_INIT_STEP0_BOOT; =20 - } else if (pfirmware->status =3D=3D FW_STATUS_5_READY) { + } else if (priv->firmware->status =3D=3D FW_STATUS_5_READY) { rst_opt =3D OPT_FIRMWARE_RESET; starting_state =3D FW_INIT_STEP2_DATA; } =20 for (i =3D starting_state; i <=3D FW_INIT_STEP2_DATA; i++) { if (rst_opt =3D=3D OPT_SYSTEM_RESET) { - if (pfirmware->blobs[i].size =3D=3D 0) { + if (priv->firmware->blobs[i].size =3D=3D 0) { const char *fw_name[3] =3D { RTL8192E_BOOT_IMG_FW, RTL8192E_MAIN_IMG_FW, @@ -161,15 +158,15 @@ bool rtl92e_init_fw(struct net_device *dev) pad =3D 128; =20 if (!_rtl92e_fw_prepare(dev, - &pfirmware->blobs[i], + &priv->firmware->blobs[i], fw_name[i], pad)) goto download_firmware_fail; } } =20 - mapped_file =3D pfirmware->blobs[i].data; - file_length =3D pfirmware->blobs[i].size; + mapped_file =3D priv->firmware->blobs[i].data; + file_length =3D priv->firmware->blobs[i].size; =20 rt_status =3D 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_devic= e *dev) =20 priv->card_type =3D PCI; =20 - priv->pFirmware =3D vzalloc(sizeof(struct rt_firmware)); - if (!priv->pFirmware) + priv->firmware =3D vzalloc(sizeof(*priv->firmware)); + if (!priv->firmware) netdev_err(dev, "rtl8192e: Unable to allocate space for firmware\n"); =20 @@ -2409,8 +2409,8 @@ static void _rtl92e_pci_disconnect(struct pci_dev *pd= ev) priv->polling_timer_on =3D 0; _rtl92e_down(dev, true); rtl92e_dm_deinit(dev); - vfree(priv->pFirmware); - priv->pFirmware =3D NULL; + vfree(priv->firmware); + priv->firmware =3D NULL; _rtl92e_free_rx_ring(dev); for (i =3D 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 { =20 enum acm_method AcmMethod; =20 - struct rt_firmware *pFirmware; + struct rt_firmware *firmware; enum rtl819x_loopback LoopbackMode; =20 struct timer_list watch_dog_timer; --=20 2.30.2