Re: rtlwifi: Move items out of rtl_pci_priv and rtl_usb_priv

[Kalle Valo]

Larry Finger <larry.fin...@lwfinger.net> wrote:
> In commit 6773386f977c ("rtlwifi: rtl8192c-common: Fix "BUG: KASAN:"),
> a BUG detected when CONFIG_KASAN=y was fixed by reordering the layouts
> of struct rtl_pci_priv, and struct rtl_usb_priv so that the variables
> used by both PCI and USB drivers have the same offsets in both structs.
> The better fix of relocating the critical variables into struct rtl_priv
> was deferred as these changes do not have to be applied to stable
> kernels.
> 
> This change also removes CamelCase variables with pLed0 => pled0.
> 
> Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>

Patch applied to wireless-drivers-next.git, thanks.

d5efe1535af0 rtlwifi: Move items out of rtl_pci_priv and rtl_usb_priv

-- 
https://patchwork.kernel.org/patch/9560369/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH] rtlwifi: Move items out of rtl_pci_priv and rtl_usb_priv

[Larry Finger]

In commit 6773386f977c ("rtlwifi: rtl8192c-common: Fix "BUG: KASAN:"),
a BUG detected when CONFIG_KASAN=y was fixed by reordering the layouts
of struct rtl_pci_priv, and struct rtl_usb_priv so that the variables
used by both PCI and USB drivers have the same offsets in both structs.
The better fix of relocating the critical variables into struct rtl_priv
was deferred as these changes do not have to be applied to stable
kernels.

This change also removes CamelCase variables with pLed0 => pled0.

Signed-off-by: Larry Finger 
---
 .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c|  14 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/led.c   |  19 +--
 .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c  | 143 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c| 166 ++---
 .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c   |  19 +--
 .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c|   3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c   |  17 ++-
 .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c|  10 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/led.c   |  19 +--
 .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c|   6 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/led.c   |  14 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c|  12 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/led.c   |  19 +--
 .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c|   8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c   |  19 +--
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c|   8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/led.c   |  15 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c|  10 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/led.c   |  24 ++-
 drivers/net/wireless/realtek/rtlwifi/usb.h |   1 -
 drivers/net/wireless/realtek/rtlwifi/wifi.h|   1 +
 21 files changed, 261 insertions(+), 286 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c 
b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 679e214..0ba26d2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -817,19 +817,18 @@ static bool _rtl88ee_llt_table_init(struct ieee80211_hw 
*hw)
 static void _rtl88ee_gen_refresh_led_state(struct ieee80211_hw *hw)
 {
struct rtl_priv *rtlpriv = rtl_priv(hw);
-   struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-   struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);
+   struct rtl_led *pled0 = >ledctl.sw_led0;
 
if (rtlpriv->rtlhal.up_first_time)
return;
 
if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)
-   rtl88ee_sw_led_on(hw, pLed0);
+   rtl88ee_sw_led_on(hw, pled0);
else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)
-   rtl88ee_sw_led_on(hw, pLed0);
+   rtl88ee_sw_led_on(hw, pled0);
else
-   rtl88ee_sw_led_off(hw, pLed0);
+   rtl88ee_sw_led_off(hw, pled0);
 }
 
 static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
@@ -1931,14 +1930,13 @@ static void _rtl88ee_read_adapter_info(struct 
ieee80211_hw *hw)
 static void _rtl88ee_hal_customized_behavior(struct ieee80211_hw *hw)
 {
struct rtl_priv *rtlpriv = rtl_priv(hw);
-   struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-   pcipriv->ledctl.led_opendrain = true;
+   rtlpriv->ledctl.led_opendrain = true;
 
switch (rtlhal->oem_id) {
case RT_CID_819X_HP:
-   pcipriv->ledctl.led_opendrain = true;
+   rtlpriv->ledctl.led_opendrain = true;
break;
case RT_CID_819X_LENOVO:
case RT_CID_DEFAULT:
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c 
b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
index 6ea7fd7..df3e214 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
@@ -67,7 +67,6 @@ void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct 
rtl_led *pled)
 void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
struct rtl_priv *rtlpriv = rtl_priv(hw);
-   struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
u8 ledcfg;
 
RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
@@ -79,7 +78,7 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct 
rtl_led *pled)
case LED_PIN_LED0:
ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
ledcfg &= 0xf0;
-   if (pcipriv->ledctl.led_opendrain) {
+   if (rtlpriv->ledctl.led_opendrain) {
rtl_write_byte(rtlpriv, REG_LEDCFG2,
   (ledcfg | BIT(3) | BIT(5) | BIT(6)));
ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
@@ -104,24 +103,26 @@