staging: rtl8712: mlme_linux.c: Remove leading p from variable names [Linux 5.3]

This Linux kernel change "staging: rtl8712: mlme_linux.c: Remove leading p from variable names" is included in the Linux 5.3 release. This change is authored by Nishka Dasgupta <nishkadg.linux [at] gmail.com> on Thu Jun 20 17:22:55 2019 +0530. The commit for this change in Linux stable tree is f745aa4 (patch).

staging: rtl8712: mlme_linux.c: Remove leading p from variable names

Remove leading p from the names of the following pointer variables:
- padapter
- pmlmepriv
- psec_priv.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

There are 34 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/rtl8712/mlme_linux.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index 4d473f0..23b87cc 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -66,16 +66,16 @@ static void wdg_timeout_handler (struct timer_list *t)
          jiffies + msecs_to_jiffies(2000));
 }

-void r8712_init_mlme_timer(struct _adapter *padapter)
+void r8712_init_mlme_timer(struct _adapter *adapter)
 {
-   struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
+   struct  mlme_priv *mlmepriv = &adapter->mlmepriv;

-   timer_setup(&pmlmepriv->assoc_timer, join_timeout_handler, 0);
-   timer_setup(&pmlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
+   timer_setup(&mlmepriv->assoc_timer, join_timeout_handler, 0);
+   timer_setup(&mlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
            sitesurvey_ctrl_handler, 0);
-   timer_setup(&pmlmepriv->scan_to_timer, _scan_timeout_handler, 0);
-   timer_setup(&pmlmepriv->dhcp_timer, dhcp_timeout_handler, 0);
-   timer_setup(&pmlmepriv->wdg_timer, wdg_timeout_handler, 0);
+   timer_setup(&mlmepriv->scan_to_timer, _scan_timeout_handler, 0);
+   timer_setup(&mlmepriv->dhcp_timer, dhcp_timeout_handler, 0);
+   timer_setup(&mlmepriv->wdg_timer, wdg_timeout_handler, 0);
 }

 void r8712_os_indicate_connect(struct _adapter *adapter)
@@ -119,16 +119,16 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
        adapter->securitypriv.btkip_countermeasure =
                     backupTKIPCountermeasure;
    } else { /*reset values in securitypriv*/
-       struct security_priv *psec_priv = &adapter->securitypriv;
-
-       psec_priv->AuthAlgrthm = 0; /*open system*/
-       psec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
-       psec_priv->PrivacyKeyIndex = 0;
-       psec_priv->XGrpPrivacy = _NO_PRIVACY_;
-       psec_priv->XGrpKeyid = 1;
-       psec_priv->ndisauthtype = Ndis802_11AuthModeOpen;
-       psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled;
-       psec_priv->wps_phase = false;
+       struct security_priv *sec_priv = &adapter->securitypriv;
+
+       sec_priv->AuthAlgrthm = 0; /*open system*/
+       sec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
+       sec_priv->PrivacyKeyIndex = 0;
+       sec_priv->XGrpPrivacy = _NO_PRIVACY_;
+       sec_priv->XGrpKeyid = 1;
+       sec_priv->ndisauthtype = Ndis802_11AuthModeOpen;
+       sec_priv->ndisencryptstatus = Ndis802_11WEPDisabled;
+       sec_priv->wps_phase = false;
    }
 }

Leave a Reply

Your email address will not be published. Required fields are marked *