Re: [PATCH 07/19] drivers: rtl8723bs: rewrite comparison to null

[Fabio Aiuto]

On Wed, Apr 07, 2021 at 05:14:00PM +0200, Greg KH wrote:
> On Wed, Apr 07, 2021 at 03:49:31PM +0200, Fabio Aiuto wrote:
> > fix following post-commit hook checkpatch warnings:
> > 
> > CHECK: Comparison to NULL could be written "!psta"
> > 97: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:2115:
> > +   if (psta == NULL)
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Nit, your subject line has "drivers:" not "staging:" here.  Be a bit
> more careful next time please.
> 
> thanks,
> 
> greg k-h

sorry, you can drop them off the staging-testing branch and I will resend you 
all if you want,

fabio

Re: [PATCH 07/19] drivers: rtl8723bs: rewrite comparison to null

[Fabio Aiuto]

On Wed, Apr 07, 2021 at 05:30:34PM +0200, Greg KH wrote:
> On Wed, Apr 07, 2021 at 05:25:34PM +0200, Fabio Aiuto wrote:
> > On Wed, Apr 07, 2021 at 05:14:00PM +0200, Greg KH wrote:
> > > On Wed, Apr 07, 2021 at 03:49:31PM +0200, Fabio Aiuto wrote:
> > > > fix following post-commit hook checkpatch warnings:
> > > > 
> > > > CHECK: Comparison to NULL could be written "!psta"
> > > > 97: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:2115:
> > > > +   if (psta == NULL)
> > > > 
> > > > Signed-off-by: Fabio Aiuto 
> > > > ---
> > > >  drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > Nit, your subject line has "drivers:" not "staging:" here.  Be a bit
> > > more careful next time please.
> > > 
> > > thanks,
> > > 
> > > greg k-h
> > 
> > sorry, you can drop them off the staging-testing branch and I will resend 
> > you all if you want,
> 
> Nah, it's not worth it, I'll keep them for now :)

:-D

Re: [PATCH 00/19] staging: rtl8723bs: remove DBG_871X trace macro

[Fabio Aiuto]

On Wed, Apr 07, 2021 at 05:14:28PM +0200, Greg KH wrote:
> On Wed, Apr 07, 2021 at 03:49:24PM +0200, Fabio Aiuto wrote:
> > This patchset removes all DBG_871X usages and definitions.
> > 
> > The whole private tracing system is not tied to a configuration
> > symbol and the default behaviour is _trace nothing_.
> > 
> > DBG_871X macros require the code to be modified by
> > hand in order to be turned on. This obviously has not happened
> > since the code was merged, so just remove them as they are unused.
> > 
> > First patch fix a DBG_871X call. It has three args over only two
> > placeholders in the first format string argument.
> > If I would not make this fix, the semantic patch
> > used to bulk remove all macro occurences would ignore the abnormal
> > macro (the one with three args) and all subsequent occurrences in
> > the same file (core/rtw_recv.c).
> > 
> > The second patch applies the cocci script.
> > 
> > This is the semantic patch:
> > 
> > @@
> > expression a, b, c, d, e, f, g, h, i, j, k;
> > constant B, C, D, E;
> > @@
> > 
> > (
> > -   DBG_871X(a);
> > |
> > -   DBG_871X(a, b);
> > |
> > -   DBG_871X(a, B);
> > |
> > -   DBG_871X(a, b, c);
> > |
> > -   DBG_871X(a, B, c);
> > |
> > -   DBG_871X(a, b, C);
> > |
> > -   DBG_871X(a, B, C);
> > |
> > -   DBG_871X(a, b, c, d);
> > |
> > -   DBG_871X(a, B, c, d);
> > |
> > -   DBG_871X(a, b, C, d);
> > |
> > -   DBG_871X(a, b, c, D);
> > |
> > -   DBG_871X(a, B, C, d);
> > |
> > -   DBG_871X(a, B, c, D);
> > |
> > -   DBG_871X(a, b, C, D);
> > |
> > -   DBG_871X(a, B, C, D);
> > |
> > -   DBG_871X(a, b, c, d, e);
> > |
> > -   DBG_871X(a, B, c, d, e);
> > |
> > -   DBG_871X(a, b, C, d, e);
> > |
> > -   DBG_871X(a, b, c, D, e);
> > |
> > -   DBG_871X(a, b, c, d, E);
> > |
> > -   DBG_871X(a, B, C, d, e);
> > |
> > -   DBG_871X(a, B, c, D, e);
> > |
> > -   DBG_871X(a, B, c, d, E);
> > |
> > -   DBG_871X(a, b, C, D, e);
> > |
> > -   DBG_871X(a, b, C, d, E);
> > |
> > -   DBG_871X(a, b, c, D, E);
> > |
> > -   DBG_871X(a, B, C, D, e);
> > |
> > -   DBG_871X(a, B, C, d, E);
> > |
> > -   DBG_871X(a, B, c, D, E);
> > |
> > -   DBG_871X(a, b, C, D, E);
> > |
> > -   DBG_871X(a, B, C, D, E);
> > |
> > -   DBG_871X(a, b, c, d, e, f);
> > |
> > -   DBG_871X(a, b, c, d, e, f, g);
> > |
> > -   DBG_871X(a, b, c, d, e, f, g, h);
> > |
> > -   DBG_871X(a, b, c, d, e, f, g, h, i);
> > |
> > -   DBG_871X(a, b, c, d, e, f, g, h, i, j);
> > |
> > -   DBG_871X(a, b, c, d, e, f, g, h, i, j, k);
> > )
> > 
> > The third one removes an unmatched macro call,
> > maybe due to the trailing \, because the occurrence is
> > inside a macro expansion.
> > 
> > The fourth one deletes all commented out call spread all over
> > the rtl8723bs code.
> > 
> > Fifth one removes definitions.
> > 
> > All remaining patches do some code cleaning on all
> > places where DBG_871X has been removed.
> 
> Nice work, thanks for doing this, all now queued up!
> 
> greg k-h

thank you,

fabio

[PATCH] staging: rtl8723bs: remove unused variables

[Fabio Aiuto]

remove declared and assigned unused variables

Reported-by: kernel test robot 
Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_cmd.c  |  3 ---
 .../staging/rtl8723bs/include/rtw_security.h  | 18 -
 .../staging/rtl8723bs/os_dep/ioctl_linux.c| 26 +++
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c 
b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index baf8b1e0f43c..e94eb1138cf1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -387,7 +387,6 @@ int rtw_cmd_thread(void *context)
u8 ret;
struct cmd_obj *pcmd;
u8 *pcmdbuf;
-   unsigned long cmd_start_time;
u8 (*cmd_hdl)(struct adapter *padapter, u8 *pbuf);
void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
struct adapter *padapter = context;
@@ -438,8 +437,6 @@ int rtw_cmd_thread(void *context)
continue;
}
 
-   cmd_start_time = jiffies;
-
if (rtw_cmd_filter(pcmdpriv, pcmd) == _FAIL) {
pcmd->res = H2C_DROPPED;
goto post_process;
diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h 
b/drivers/staging/rtl8723bs/include/rtw_security.h
index b71f0959108b..5c787e999aab 100644
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -332,24 +332,6 @@ static inline u32 rotr(u32 val, int bits)
 /* This is based on SHA256 implementation in LibTomCrypt that was released into
  * public domain by Tom St Denis. */
 
-/* the K array */
-static const unsigned long K[64] = {
-   0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
-   0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
-   0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
-   0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
-   0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
-   0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
-   0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
-   0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
-   0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
-   0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
-   0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
-   0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
-   0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-
 /* Various logical functions */
 #define RORc(x, y) \
 (unsigned long) (x) & 0xUL) >> (unsigned long) ((y) & 31)) | \
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index a9820d813d8b..8d29ca9ba67f 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -33,10 +33,6 @@
 static u32 rtw_rates[] = {100, 200, 550, 1100,
600, 900, 1200, 1800, 2400, 3600, 4800, 
5400};
 
-static const char * const iw_operation_mode[] = {
-   "Auto", "Ad-Hoc", "Managed",  "Master", "Repeater", "Secondary", 
"Monitor"
-};
-
 void indicate_wx_scan_complete_event(struct adapter *padapter)
 {
union iwreq_data wrqu;
@@ -1125,7 +1121,6 @@ static int rtw_wx_set_mlme(struct net_device *dev,
 union iwreq_data *wrqu, char *extra)
 {
int ret = 0;
-   u16 reason;
struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_mlme *mlme = (struct iw_mlme *)extra;
 
@@ -1133,8 +1128,6 @@ static int rtw_wx_set_mlme(struct net_device *dev,
if (mlme == NULL)
return -1;
 
-   reason = mlme->reason_code;
-
switch (mlme->cmd) {
case IW_MLME_DEAUTH:
if (!rtw_set_802_11_disassociate(padapter))
@@ -2440,7 +2433,6 @@ static int rtw_dbg_port(struct net_device *dev,
u8 major_cmd, minor_cmd;
u16 arg;
u32 extra_arg, *pdata, val32;
-   struct sta_info *psta;
struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -2542,15 +2534,7 @@ static int rtw_dbg_port(struct net_device *dev,
 
break;
case 0x05:
-   psta = rtw_get_stainfo(pstapriv, 
cur_network->network.MacAddress);
-   if (psta) {
-

Re: [PATCH] staging: rtl8723bs: remove unused variables

[Fabio Aiuto]

On Thu, Apr 08, 2021 at 11:46:15AM +0200, Greg KH wrote:
> On Thu, Apr 08, 2021 at 11:27:02AM +0200, Fabio Aiuto wrote:
> > remove declared and assigned unused variables
> 
> You need to be a lot more specific here.

Shall I describe that some of these became unused
after DBG_871X removal?

> 
> > Reported-by: kernel test robot 
> 
> For all of these?

yes, actually, not just the ">>" marked ones, but also
all others reported in automatic email.

Shall I limit to the marked ones?

Should I put in In-Reply-To the test robot email?

Or just the output of the test robot in the changelog?

> 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_cmd.c  |  3 ---
> >  .../staging/rtl8723bs/include/rtw_security.h  | 18 -
> >  .../staging/rtl8723bs/os_dep/ioctl_linux.c| 26 +++
> >  3 files changed, 3 insertions(+), 44 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c 
> > b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> > index baf8b1e0f43c..e94eb1138cf1 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> > @@ -387,7 +387,6 @@ int rtw_cmd_thread(void *context)
> > u8 ret;
> > struct cmd_obj *pcmd;
> > u8 *pcmdbuf;
> > -   unsigned long cmd_start_time;
> > u8 (*cmd_hdl)(struct adapter *padapter, u8 *pbuf);
> > void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
> > struct adapter *padapter = context;
> > @@ -438,8 +437,6 @@ int rtw_cmd_thread(void *context)
> > continue;
> > }
> >  
> > -   cmd_start_time = jiffies;
> > -
> > if (rtw_cmd_filter(pcmdpriv, pcmd) == _FAIL) {
> > pcmd->res = H2C_DROPPED;
> > goto post_process;
> 
> How about one patch per variable that is being removed as this was fine,
> but others below are not ok.

so just one patch per variable removed, right?
I will send a small patchset instead of this.

> 
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h 
> > b/drivers/staging/rtl8723bs/include/rtw_security.h
> > index b71f0959108b..5c787e999aab 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_security.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_security.h
> > @@ -332,24 +332,6 @@ static inline u32 rotr(u32 val, int bits)
> >  /* This is based on SHA256 implementation in LibTomCrypt that was released 
> > into
> >   * public domain by Tom St Denis. */
> >  
> > -/* the K array */
> > -static const unsigned long K[64] = {
> > -   0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
> > -   0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
> > -   0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
> > -   0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
> > -   0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
> > -   0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
> > -   0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
> > -   0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
> > -   0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
> > -   0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
> > -   0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
> > -   0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
> > -   0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
> > -};
> > -
> > -
> >  /* Various logical functions */
> >  #define RORc(x, y) \
> >  (unsigned long) (x) & 0xUL) >> (unsigned long) ((y) & 31)) | \
> > diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c 
> > b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> > index a9820d813d8b..8d29ca9ba67f 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
> > @@ -33,10 +33,6 @@
> >  static u32 rtw_rates[] = {100, 200, 550, 1100,
> > 600, 900, 1200, 1800, 2400, 3600, 4800, 
> > 5400};
> >  
> > -static const char * const iw_operation_mode[] = {
> > -   "Auto", "Ad-Hoc", "Managed",  "Master", "Repeater", "Secondary", 
> > "Monitor"
> > -};
> > -
> >  void indicate_wx_scan_comp

Re: CHECKPATCH: missing a warning soon after include files decl -c

[Fabio Aiuto]

On Sat, Mar 20, 2021 at 04:28:51AM -0700, Joe Perches wrote:
> 
> Actually, these would seem to be better as one or multiple functions with
> local statics or even as static inlines functions in the .h file
> 
> $ git grep -w RTW_WPA_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char RTW_WPA_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:if (!memcmp(RTW_WPA_OUI, oui, 
> 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char RTW_WPA_OUI[] = 
> {0x00, 0x50, 0xf2, 0x01};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if 
> ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) ||
> drivers/staging/rtl8723bs/core/rtw_wlan_util.c:extern unsigned char 
> RTW_WPA_OUI[];
> drivers/staging/rtl8723bs/core/rtw_wlan_util.c: if 
> ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) && (!memcmp((pIE->data + 12), 
> WPA_TKIP_CIPHER, 4)))
> 
> $ git grep -w WMM_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char WMM_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:else if (!memcmp(WMM_OUI, 
> oui, 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char WMM_OUI[] = 
> {0x00, 0x50, 0xf2, 0x02};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:
>   (!memcmp(pIE->data, WMM_OUI, 4)) ||
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if 
> (!memcmp(pIE->data, WMM_OUI, 4))
> drivers/staging/rtl8723bs/include/rtw_mlme_ext.h:extern unsigned char 
> WMM_OUI[];
> 
> $ git grep -w WPS_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char WPS_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:else if (!memcmp(WPS_OUI, 
> oui, 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char WPS_OUI[] = 
> {0x00, 0x50, 0xf2, 0x04};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:
>   (!memcmp(pIE->data, WPS_OUI, 4))) {
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if 
> ((!padapter->registrypriv.wifi_spec) && (!memcmp(pIE->data, WPS_OUI, 4))) {
> 
> $ git grep -w P2P_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char P2P_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:else if (!memcmp(P2P_OUI, 
> oui, 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char P2P_OUI[] = 
> {0x50, 0x6F, 0x9A, 0x09};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if (!memcmp(frame_body + 2, 
> P2P_OUI, 4)) {
> 
> So maybe something like the below (written in email client, maybe typos)
> 
> enum oui_type {
>   RTW_WPA,
>   WMM,
>   WPS,
>   P2P
> };
> 
> bool is_oui_type(const u8 *mem, enum oui_type type)
> {
>   static const u8 rtw_wpa[] = {0x00, 0x50, 0xf2, 0x01};
>   static const u8 wmm[] = {0x00, 0x50, 0xf2, 0x02};
>   static const u8 wps[] = {0x00, 0x50, 0xf2, 0x04};
>   static const u8 p2p[] = {0x50, 0x6F, 0x9A, 0x09};
> 
>   const u8 *oui;
> 
>   if (type == RTW_WPA)
>   oui = rtw_wpa;
>   else if (type == WMM)
>   oui = wmm;
>   else if (type == WPS)
>   oui = wps;
>   else if (type == P2P)
>   oui = p2p;
>   else
>   return false;
> 
>   return !memcmp(mem, oui, 4);
> }
> 
> so for instance the P2P uses would become
> 
>   else if (is_oui_type(oui, P2P))
> and
>   if (is_oui_type(frame_body + 2, P2P)) {
> 
> though I think 4 byte OUIs are just odd.
> 
> https://en.wikipedia.org/wiki/Organizationally_unique_identifier
> 
> An organizationally unique identifier (OUI) is a 24-bit number that uniquely 
> identifies a vendor, manufacturer, or other organization.
> 
> 
> 

Hi,

is that good? May I do the same for others ouis? One small inline for each oui 
type instead
of a switch...

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 3cd9c61eec99..7d31f359cf37 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1664,7 +1664,7 @@ static void update_bcn_p2p_ie(struct adapter *padapter)
 
 static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui)
 {
-   if (!memcmp(RTW_WPA_OUI, oui, 4))
+   if (is_rtw_wpa_oui(oui))
update_bcn_wpa_ie(padapter);
 
else if (!memcmp(WMM_OUI, oui, 4))
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 8aadcf72a7ba..e05f70e434a2 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -57,7 +57,6 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
 /**
 OUI definitions for the vendor specific IE
 ***/
-unsigned char RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01};
 unsigned char WMM_O

[PATCH 1/3] staging: rtl8723bs: remove assignment in condition in core/rtw_ieee80211.c

[Fabio Aiuto]

fix the following checkpatch warning:

ERROR: do not use assignment in if condition
1118: FILE: drivers/staging/rtl8723bs/core/rtw_ieee80211.c:1118:
+   if ((addr = of_get_property(np, "local-mac-address", &len)) &&

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c 
b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index cccbea555a32..e931afc3ba22 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -1115,8 +1115,9 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr)
}
 
if (is_broadcast_ether_addr(mac) || is_zero_ether_addr(mac)) {
-   if ((addr = of_get_property(np, "local-mac-address", &len)) &&
-   len == ETH_ALEN) {
+   addr = of_get_property(np, "local-mac-address", &len);
+
+   if (addr && len == ETH_ALEN) {
ether_addr_copy(mac_addr, addr);
} else {
eth_random_addr(mac_addr);
-- 
2.20.1

[PATCH 0/3] staging: rtl8723bs: remove assignment in conditions

[Fabio Aiuto]

remove all assignment in conditions in rtl8723bs, 
warned by checkpatch.pl

Fabio Aiuto (3):
  staging: rtl8723bs: remove assignment in condition in
core/rtw_ieee80211.c
  staging: rtl8723bs: remove assignment in condition in
os_dep/ioctl_cfg80211.c
  staging: rtl8723bs: remove assignment in condition in
os_dep/ioctl_linux.c

 drivers/staging/rtl8723bs/core/rtw_ieee80211.c|  5 +++--
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 -
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c|  9 ++---
 3 files changed, 17 insertions(+), 10 deletions(-)

-- 
2.20.1

[PATCH 3/3] staging: rtl8723bs: remove assignment in condition in os_dep/ioctl_linux.c

[Fabio Aiuto]

fix the following checkpatch warning:

ERROR: do not use assignment in if condition
2607: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_linux.c:2607:
+   if (0 != (ret = rtw_change_ifname(padapter, new_ifname)))
--
ERROR: do not use assignment in if condition
4239: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_linux.c:4239:
+   if (!(ext = vmalloc(len)))
--
ERROR: do not use assignment in if condition
4253: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_linux.c:4253:
+   if (!(ext_dbg = vmalloc(len))) {

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 9909dece0b01..eac98e455413 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -2604,7 +2604,8 @@ static int rtw_rereg_nd_name(struct net_device *dev,
return ret;
 
DBG_871X("%s new_ifname:%s\n", __func__, new_ifname);
-   if (0 != (ret = rtw_change_ifname(padapter, new_ifname)))
+   ret = rtw_change_ifname(padapter, new_ifname);
+   if (ret != 0)
goto exit;
 
strncpy(rereg_priv->old_ifname, new_ifname, IFNAMSIZ);
@@ -4236,7 +4237,8 @@ static int rtw_wx_set_priv(struct net_device *dev,
return -EFAULT;
 
len = dwrq->length;
-   if (!(ext = vmalloc(len)))
+   ext = vmalloc(len);
+   if (!ext)
return -ENOMEM;
 
if (copy_from_user(ext, dwrq->pointer, len)) {
@@ -4250,7 +4252,8 @@ static int rtw_wx_set_priv(struct net_device *dev,
/*dev->name, ext)); */
 
#ifdef DEBUG_RTW_WX_SET_PRIV
-   if (!(ext_dbg = vmalloc(len))) {
+   ext_dbg = vmalloc(len);
+   if (!ext_dbg) {
vfree(ext, len);
return -ENOMEM;
}
-- 
2.20.1

[PATCH 2/3] staging: rtl8723bs: remove assignment in condition in os_dep/ioctl_cfg80211.c

[Fabio Aiuto]

fix the following checkpatch warning:

ERROR: do not use assignment in if condition
1440: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:1440:
+   if ((wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen)))
--
ERROR: do not use assignment in if condition
2465: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:2465:
+   if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
--
ERROR: do not use assignment in if condition
2937: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:2937:
+   if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) {
--
ERROR: do not use assignment in if condition
3335: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3335:
+   if (!(ndev = wdev_to_ndev(wdev)))

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 03a784558d79..8deaf98a83dd 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1437,7 +1437,8 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct 
adapter *padapter, char *b
 
if (len > 0)
{
-   if ((wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen)))
+   wps_ie = rtw_get_wps_ie(buf, len, NULL, &wps_ielen);
+   if (wps_ie)
{
#ifdef DEBUG_CFG80211
DBG_8192C("probe_req_wps_ielen =%d\n", wps_ielen);
@@ -2462,7 +2463,8 @@ static netdev_tx_t 
rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, 
action);
 
/* starting alloc mgmt frame to dump it */
-   if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
+   pmgntframe = alloc_mgtxmitframe(pxmitpriv);
+   if (!pmgntframe)
goto fail;
 
/* update attribute */
@@ -2934,7 +2936,8 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter 
*padapter, u8 tx_ch, const u8 *b
}
 
/* starting alloc mgmt frame to dump it */
-   if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) {
+   pmgntframe = alloc_mgtxmitframe(pxmitpriv);
+   if (!pmgntframe) {
/* ret = -ENOMEM; */
ret = _FAIL;
goto exit;
@@ -3331,8 +3334,8 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
 
if (!wdev)
return;
-
-   if (!(ndev = wdev_to_ndev(wdev)))
+   ndev = wdev_to_ndev(wdev);
+   if (!ndev)
return;
 
adapter = rtw_netdev_priv(ndev);
-- 
2.20.1

[PATCH] staging: rtl8723bs: fix indentation broken by previous patch

[Fabio Aiuto]

fix indentation broken by patch removing conditional
code blocks checked by unused
CONFIG_INTERRUPT_BASED_TXBCN family defines

https://lore.kernel.org/r/9157000821fd6febf25566b8c712fad1995c7c78.1615907632.git.fabioaiut...@gmail.com

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 3cd9c61eec99..dc56477eb084 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -907,9 +907,9 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
if (pmlmeext->bstart_bss) {
update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-   /* issue beacon frame */
-   if (send_beacon(padapter) == _FAIL)
-   DBG_871X("issue_beacon, fail!\n");
+   /* issue beacon frame */
+   if (send_beacon(padapter) == _FAIL)
+   DBG_871X("issue_beacon, fail!\n");
 
}
 
-- 
2.20.1

[PATCH v2] staging: rtl8723bs: remove unnecessary logging in os_dep/ioctl_cfg80211.c

[Fabio Aiuto]

fix the following checkpatch.pl issues:

WARNING: Unnecessary ftrace-like logging - prefer using ftrace
239: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:239:
+   /* DBG_8192C("%s\n", __func__); */
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
569: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:569:
+   DBG_8192C("%s\n", __func__);
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
854: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:854:
+   DBG_8192C("%s\n", __func__);
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
1408: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:1408:
+   DBG_8192C("%s\n", __func__);
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
1645: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:1645:
+   DBG_8192C("%s\n", __func__);
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c::
+   DBG_8192C("%s\n", __func__);
--
WARNING: Unnecessary ftrace-like logging - prefer using ftrace
2230: FILE: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:2230:
+   DBG_8192C("%s\n", __func__);

Changes in v2:
removed empty #ifdef block

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c   | 17 -
 1 file changed, 17 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index e70bb7f1ca3a..a577ddcce8cd 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -235,9 +235,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter 
*padapter, struct wl
struct wiphy *wiphy = wdev->wiphy;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
-
-   /* DBG_8192C("%s\n", __func__); */
-
bssinf_len = pnetwork->network.IELength + sizeof(struct 
ieee80211_hdr_3addr);
if (bssinf_len > MAX_BSSINFO_LEN) {
DBG_871X("%s IE Length too long > %d byte\n", __func__, 
MAX_BSSINFO_LEN);
@@ -566,8 +563,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device 
*dev, struct ieee_pa
struct security_priv *psecuritypriv =  &(padapter->securitypriv);
struct sta_priv *pstapriv = &padapter->stapriv;
 
-   DBG_8192C("%s\n", __func__);
-
param->u.crypt.err = 0;
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
 
@@ -851,8 +846,6 @@ static int rtw_cfg80211_set_encryption(struct net_device 
*dev, struct ieee_param
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv;
 
-   DBG_8192C("%s\n", __func__);
-
param->u.crypt.err = 0;
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
 
@@ -1404,10 +1397,6 @@ void rtw_cfg80211_surveydone_event_callback(struct 
adapter *padapter)
struct __queue *queue   = &(pmlmepriv->scanned_queue);
struct  wlan_network*pnetwork = NULL;
 
-#ifdef DEBUG_CFG80211
-   DBG_8192C("%s\n", __func__);
-#endif
-
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
 
phead = get_list_head(queue);
@@ -1642,12 +1631,9 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
 
 static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
-   DBG_8192C("%s\n", __func__);
return 0;
 }
 
-
-
 static int rtw_cfg80211_set_wpa_version(struct security_priv *psecuritypriv, 
u32 wpa_version)
 {
DBG_8192C("%s, wpa_version =%d\n", __func__, wpa_version);
@@ -2219,7 +2205,6 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy,
struct wireless_dev *wdev,
enum nl80211_tx_power_setting type, int mbm)
 {
-   DBG_8192C("%s\n", __func__);
return 0;
 }
 
@@ -2227,8 +2212,6 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
struct wireless_dev *wdev,
int *dbm)
 {
-   DBG_8192C("%s\n", __func__);
-
*dbm = (12);
 
return 0;
-- 
2.20.1

CHECKPATCH: missing a warning soon after include files decl -c

[Fabio Aiuto]

Hi,

here's an issue in checkpatch.pl

$ perl script/checkpatch.pl -f drivers/staging/rtl8723bs/core/rtw_ap.c

I get three warning related to an extern declaration

WARNING: externs should be avoided in .c files
#14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
+extern unsigned char WMM_OUI[];
--
WARNING: externs should be avoided in .c files
#15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
+extern unsigned char WPS_OUI[];
--
WARNING: externs should be avoided in .c files
#16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
+extern unsigned char P2P_OUI[];
--

but the file checked has 4 extern declaration:
-
#define _RTW_AP_C_

#include 
#include 
#include 

extern unsigned char RTW_WPA_OUI[];
extern unsigned char WMM_OUI[];
extern unsigned char WPS_OUI[];
extern unsigned char P2P_OUI[];

void init_mlme_ap_info(struct adapter *padapter)
---

If I add a ';' this way:

#define _RTW_AP_C_

#include 
#include 
#include 
;
extern unsigned char RTW_WPA_OUI[];
extern unsigned char WMM_OUI[];
extern unsigned char WPS_OUI[];
extern unsigned char P2P_OUI[];

void init_mlme_ap_info(struct adapter *padapter)


the missing warning appears:
--
WARNING: externs should be avoided in .c files
#13: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:13:
+extern unsigned char RTW_WPA_OUI[];
--
WARNING: externs should be avoided in .c files
#14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
+extern unsigned char WMM_OUI[];
--
WARNING: externs should be avoided in .c files
#15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
+extern unsigned char WPS_OUI[];
--
WARNING: externs should be avoided in .c files
#16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
+extern unsigned char P2P_OUI[];
---
Applying this ugly patch to debug:

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index df8b23dc1eb0..ecbbb731361c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -6810,6 +6810,11 @@ sub process {
{
WARN("AVOID_EXTERNS",
 "externs should be avoided in .c files\n" .  
$herecurr);
+   } elsif ($realfile =~ /\.c$/ && defined $stat &&
+   $stat =~ /extern\s+/)
+   {
+   WARN("AVOID_EXTERNS",
+"print stat value\n" .  $stat);
}
 
 # check for function declarations that have arguments without identifier names

--
I get:

WARNING: print stat value
+#include 
 #include 
 #include 
 
 extern unsigned char RTW_WPA_OUI[];
WARNING: externs should be avoided in .c files
#14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
+extern unsigned char WMM_OUI[];

WARNING: externs should be avoided in .c files
#15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
+extern unsigned char WPS_OUI[];

WARNING: externs should be avoided in .c files
#16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
+extern unsigned char P2P_OUI[];

I don't know if it's best to fix the regex of the particular "extern in .c 
files issue"
or maybe how the statement is computed. Should a statement represent a single 
line?

Suggestions are welcome,

fabio

Re: CHECKPATCH: missing a warning soon after include files decl -c

[Fabio Aiuto]

On Sat, Mar 20, 2021 at 04:28:51AM -0700, Joe Perches wrote:
> On Sat, 2021-03-20 at 11:59 +0100, Greg KH wrote:
> > On Sat, Mar 20, 2021 at 11:54:24AM +0100, Fabio Aiuto wrote:
> > > Hi,
> > > 
> > > here's an issue in checkpatch.pl
> > > 
> > > $ perl script/checkpatch.pl -f drivers/staging/rtl8723bs/core/rtw_ap.c
> > > 
> > > I get three warning related to an extern declaration
> > > 
> > > WARNING: externs should be avoided in .c files
> > > #14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
> > > +extern unsigned char WMM_OUI[];
> > > --
> > > WARNING: externs should be avoided in .c files
> > > #15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
> > > +extern unsigned char WPS_OUI[];
> > > --
> > > WARNING: externs should be avoided in .c files
> > > #16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
> > > +extern unsigned char P2P_OUI[];
> > > --
> > > 
> > > but the file checked has 4 extern declaration:
> > > -
> > > #define _RTW_AP_C_
> > > 
> > > #include 
> > > #include 
> > > #include 
> > > 
> > > extern unsigned char RTW_WPA_OUI[];
> > > extern unsigned char WMM_OUI[];
> > > extern unsigned char WPS_OUI[];
> > > extern unsigned char P2P_OUI[];
> > > 
> > > void init_mlme_ap_info(struct adapter *padapter)
> > > ---
> > > 
> > > If I add a ';' this way:
> > > 
> > > #define _RTW_AP_C_
> > > 
> > > #include 
> > > #include 
> > > #include 
> > > ;
> > > extern unsigned char RTW_WPA_OUI[];
> > > extern unsigned char WMM_OUI[];
> > > extern unsigned char WPS_OUI[];
> > > extern unsigned char P2P_OUI[];
> > > 
> > > void init_mlme_ap_info(struct adapter *padapter)
> > > 
> > 
> > Wait, why would you do the above?
> 
> It is rather an ugly hack.

yes it is, it was just a local and temporary one to verify that checkpatch.pl
recognizes a statement even in multiple lines, until the next ';'. In my case 
it has his own
drawbacks, but I will follow Greg's advice, to let checkpatch.pl doing his 
heavy duty:) 

> 
> > Don't try to trick a perl script that has a hard time parsing C files,
> > try to resolve the original issue here.
> > 
> > And that is that the above definitions should be in a .h file somewhere.
> > If you make that move then all should be fine.
> 
> Actually, these would seem to be better as one or multiple functions with
> local statics or even as static inlines functions in the .h file
> 
> $ git grep -w RTW_WPA_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char RTW_WPA_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:if (!memcmp(RTW_WPA_OUI, oui, 
> 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char RTW_WPA_OUI[] = 
> {0x00, 0x50, 0xf2, 0x01};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if 
> ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) ||
> drivers/staging/rtl8723bs/core/rtw_wlan_util.c:extern unsigned char 
> RTW_WPA_OUI[];
> drivers/staging/rtl8723bs/core/rtw_wlan_util.c: if 
> ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) && (!memcmp((pIE->data + 12), 
> WPA_TKIP_CIPHER, 4)))
> 
> $ git grep -w WMM_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char WMM_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:else if (!memcmp(WMM_OUI, 
> oui, 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char WMM_OUI[] = 
> {0x00, 0x50, 0xf2, 0x02};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:
>   (!memcmp(pIE->data, WMM_OUI, 4)) ||
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:  if 
> (!memcmp(pIE->data, WMM_OUI, 4))
> drivers/staging/rtl8723bs/include/rtw_mlme_ext.h:extern unsigned char 
> WMM_OUI[];
> 
> $ git grep -w WPS_OUI drivers/staging/rtl8723bs/core
> drivers/staging/rtl8723bs/core/rtw_ap.c:extern unsigned char WPS_OUI[];
> drivers/staging/rtl8723bs/core/rtw_ap.c:else if (!memcmp(WPS_OUI, 
> oui, 4))
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:unsigned char WPS_OUI[] = 
> {0x00, 0x50, 0xf2, 0x04};
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:
>   (!memcmp(pIE->data, WPS_OUI, 4))) {
> driv

Re: CHECKPATCH: missing a warning soon after include files decl -c

[Fabio Aiuto]

On Sat, Mar 20, 2021 at 11:59:44AM +0100, Greg KH wrote:
> On Sat, Mar 20, 2021 at 11:54:24AM +0100, Fabio Aiuto wrote:
> > Hi,
> > 
> > here's an issue in checkpatch.pl
> > 
> > $ perl script/checkpatch.pl -f drivers/staging/rtl8723bs/core/rtw_ap.c
> > 
> > I get three warning related to an extern declaration
> > 
> > WARNING: externs should be avoided in .c files
> > #14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
> > +extern unsigned char WMM_OUI[];
> > --
> > WARNING: externs should be avoided in .c files
> > #15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
> > +extern unsigned char WPS_OUI[];
> > --
> > WARNING: externs should be avoided in .c files
> > #16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
> > +extern unsigned char P2P_OUI[];
> > --
> > 
> > but the file checked has 4 extern declaration:
> > -
> > #define _RTW_AP_C_
> > 
> > #include 
> > #include 
> > #include 
> > 
> > extern unsigned char RTW_WPA_OUI[];
> > extern unsigned char WMM_OUI[];
> > extern unsigned char WPS_OUI[];
> > extern unsigned char P2P_OUI[];
> > 
> > void init_mlme_ap_info(struct adapter *padapter)
> > ---
> > 
> > If I add a ';' this way:
> > 
> > #define _RTW_AP_C_
> > 
> > #include 
> > #include 
> > #include 
> > ;
> > extern unsigned char RTW_WPA_OUI[];
> > extern unsigned char WMM_OUI[];
> > extern unsigned char WPS_OUI[];
> > extern unsigned char P2P_OUI[];
> > 
> > void init_mlme_ap_info(struct adapter *padapter)
> > 
> 
> Wait, why would you do the above?
> 
> Don't try to trick a perl script that has a hard time parsing C files,
> try to resolve the original issue here.
> 
> And that is that the above definitions should be in a .h file somewhere.
> If you make that move then all should be fine.
> 
> thanks,
> 
> greg k-h

that's another issue

WARNING: externs should be avoided in .c files
#35: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:35:
+bool

CHECK: Lines should not end with a '('
#36: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:36:
---

but that's what I see in line 35


#define REG_EFUSE_CTRL  0x0030
#define EFUSE_CTRL  REG_EFUSE_CTRL  /*  E-Fuse 
Control. */

bool<- line 35
Efuse_Read1ByteFromFakeContent(
struct adapter *padapter,
u16 Offset,
u8 *Value);
bool
Efuse_Read1ByteFromFakeContent(
struct adapter *padapter,

another one...

WARNING: externs should be avoided in .c files
#40: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:40:
+u8 rtw_do_join(struct adapter *padapter); < do I miss 
something about extern keyword?

CHECK: Unnecessary parentheses around padapter->mlmepriv
#45: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:45:

thank you,

fabio

[PATCH v2 0/9] fix extern declarations checkpatch issues

[Fabio Aiuto]

Fix extern declaration issues warned by checkpatch.

Changes in v2:
- removal of prototypes when function can be static
- move of static function defs inside file to let the code compile
- split last patch in two patches (one patch for blank line removal)

Fabio Aiuto (9):
  staging: rtl8723bs: removed function prototypes in core/rtw_efuse.c
  staging: rtl8723bs: moved function prototype out of
core/rtw_ioctl_set.c and core/rtw_mlme.c
  staging: rtl8723bs: removed function prototypes and made statics in
core/rtw_recv.c
  staging: rtl8723bs: delete extern declarations in core/rtw_wlan_util.c
  staging: rtl8723bs: remove function prototypes in hal/odm.c
  staging: rtl8723bs: move function prototypes out of os_dep/int_fs.c
  staging: rtl8723bs: remove undefined function prototype in of
os_dep/sdio_intf.c
  staging: rtl8723bs: remove unnecessary extern in os_dep/sdio_intf.c
  staging: rtl8723bs: remove blank line os_dep/os_intfs.c

 drivers/staging/rtl8723bs/core/rtw_efuse.c|   14 +-
 .../staging/rtl8723bs/core/rtw_ioctl_set.c|1 -
 drivers/staging/rtl8723bs/core/rtw_mlme.c |2 -
 drivers/staging/rtl8723bs/core/rtw_recv.c |  441 ++---
 .../staging/rtl8723bs/core/rtw_wlan_util.c|3 -
 drivers/staging/rtl8723bs/hal/odm.c   | 1717 -
 .../staging/rtl8723bs/include/osdep_intf.h|2 +
 .../staging/rtl8723bs/include/rtw_ioctl_set.h |2 +
 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c |2 -
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   |5 +-
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c  |3 -
 11 files changed, 1038 insertions(+), 1154 deletions(-)

-- 
2.20.1

[PATCH v2 1/9] staging: rtl8723bs: removed function prototypes in core/rtw_efuse.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
35: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:35:
+bool

removed two function prototypes in core/rtw_efuse.c and
made definition static

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c 
b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 32ca10f01413..3701336e7ff6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -32,12 +32,7 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
 #define REG_EFUSE_CTRL 0x0030
 #define EFUSE_CTRL REG_EFUSE_CTRL  /*  E-Fuse 
Control. */
 
-bool
-Efuse_Read1ByteFromFakeContent(
-   struct adapter *padapter,
-   u16 Offset,
-   u8 *Value);
-bool
+static bool
 Efuse_Read1ByteFromFakeContent(
struct adapter *padapter,
u16 Offset,
@@ -53,12 +48,7 @@ Efuse_Read1ByteFromFakeContent(
return true;
 }
 
-bool
-Efuse_Write1ByteToFakeContent(
-   struct adapter *padapter,
-   u16 Offset,
-   u8 Value);
-bool
+static bool
 Efuse_Write1ByteToFakeContent(
struct adapter *padapter,
u16 Offset,
-- 
2.20.1

[PATCH v2 3/9] staging: rtl8723bs: removed function prototypes and made statics in core/rtw_recv.c

[Fabio Aiuto]

fix the following checkpatch issue:

WARNING: externs should be avoided in .c files
1190: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:1190:
+signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame 
*precv_frame);

removed function prototypes and made statics

moved two static function definitions before their usage
to make code compile

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c | 441 ++
 1 file changed, 207 insertions(+), 234 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 1fa381663b4c..608a59286505 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -305,8 +305,7 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue)
 
 }
 
-signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame 
*precvframe);
-signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame 
*precvframe)
+static signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame 
*precvframe)
 {
 
signed int  i, res = _SUCCESS;
@@ -436,8 +435,7 @@ signed int recvframe_chkmic(struct adapter *adapter,  union 
recv_frame *precvfra
 }
 
 /* decrypt and set the ivlen, icvlen of the recv_frame */
-union recv_frame *decryptor(struct adapter *padapter, union recv_frame 
*precv_frame);
-union recv_frame *decryptor(struct adapter *padapter, union recv_frame 
*precv_frame)
+static union recv_frame *decryptor(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
 
struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib;
@@ -528,8 +526,7 @@ union recv_frame *decryptor(struct adapter *padapter, union 
recv_frame *precv_fr
 }
 
 /* set the security information in the recv_frame */
-union recv_frame *portctrl(struct adapter *adapter, union recv_frame 
*precv_frame);
-union recv_frame *portctrl(struct adapter *adapter, union recv_frame 
*precv_frame)
+static union recv_frame *portctrl(struct adapter *adapter, union recv_frame 
*precv_frame)
 {
u8 *psta_addr = NULL;
u8 *ptr;
@@ -606,8 +603,7 @@ union recv_frame *portctrl(struct adapter *adapter, union 
recv_frame *precv_fram
return prtnframe;
 }
 
-signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct 
stainfo_rxcache *prxcache);
-signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct 
stainfo_rxcache *prxcache)
+static signed int recv_decache(union recv_frame *precv_frame, u8 bretry, 
struct stainfo_rxcache *prxcache)
 {
signed int tid = precv_frame->u.hdr.attrib.priority;
 
@@ -634,8 +630,7 @@ signed int recv_decache(union recv_frame *precv_frame, u8 
bretry, struct stainfo
 
 }
 
-void process_pwrbit_data(struct adapter *padapter, union recv_frame 
*precv_frame);
-void process_pwrbit_data(struct adapter *padapter, union recv_frame 
*precv_frame)
+static void process_pwrbit_data(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
unsigned char pwrbit;
u8 *ptr = precv_frame->u.hdr.rx_data;
@@ -671,8 +666,7 @@ void process_pwrbit_data(struct adapter *padapter, union 
recv_frame *precv_frame
}
 }
 
-void process_wmmps_data(struct adapter *padapter, union recv_frame 
*precv_frame);
-void process_wmmps_data(struct adapter *padapter, union recv_frame 
*precv_frame)
+static void process_wmmps_data(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
struct sta_priv *pstapriv = &padapter->stapriv;
@@ -723,8 +717,7 @@ void process_wmmps_data(struct adapter *padapter, union 
recv_frame *precv_frame)
}
 }
 
-void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, 
struct sta_info *sta);
-void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, 
struct sta_info *sta)
+static void count_rx_stats(struct adapter *padapter, union recv_frame 
*prframe, struct sta_info *sta)
 {
int sz;
struct sta_info *psta = NULL;
@@ -755,9 +748,7 @@ void count_rx_stats(struct adapter *padapter, union 
recv_frame *prframe, struct
traffic_check_for_leave_lps(padapter, false, 0);
 }
 
-signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
-   struct sta_info **psta);
-signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
+static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
struct sta_info **psta)
 {
u8 *ptr = precv_frame->u.hdr.rx_data;
@@ -850,9 +841,7 @@ signed int sta2sta_data_frame(struct adapter *adapter, 
union recv_frame *precv_f
return ret;
 }
 
-signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
-  struct sta_info **psta);
-signed int ap2sta_data_frame(struct adap

[PATCH v2 2/9] staging: rtl8723bs: moved function prototype out of core/rtw_ioctl_set.c and core/rtw_mlme.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
40: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:40:
+u8 rtw_do_join(struct adapter *padapter);

WARNING: externs should be avoided in .c files
15: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:15:
+extern u8 rtw_do_join(struct adapter *padapter);

moved function prototype in include/rtw_ioctl_set.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c| 1 -
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 --
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index cb14855742f7..7d858cae2395 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -37,7 +37,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
return ret;
 }
 
-u8 rtw_do_join(struct adapter *padapter);
 u8 rtw_do_join(struct adapter *padapter)
 {
struct list_head*plist, *phead;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 95cfef118a94..1ee86ec2dee7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -12,8 +12,6 @@
 #include 
 #include 
 
-extern u8 rtw_do_join(struct adapter *padapter);
-
 intrtw_init_mlme_priv(struct adapter *padapter)
 {
int i;
diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h 
b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
index d6d3c39a69c6..31424bf2d926 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
@@ -22,6 +22,8 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 
*bssid, struct ndis_802_1
 u8 rtw_validate_bssid(u8 *bssid);
 u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
 
+u8 rtw_do_join(struct adapter *padapter);
+
 u16 rtw_get_cur_max_rate(struct adapter *adapter);
 
 #endif
-- 
2.20.1

[PATCH v2 4/9] staging: rtl8723bs: delete extern declarations in core/rtw_wlan_util.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
28: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:28:
+extern unsigned char RTW_WPA_OUI[];
--
WARNING: externs should be avoided in .c files
29: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:29:
+extern unsigned char WPA_TKIP_CIPHER[4];

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index bfd55a0356f5..760b0ea4e9bd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -25,9 +25,6 @@ static unsigned char AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5};
 static unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
 static unsigned char WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02};
 
-extern unsigned char RTW_WPA_OUI[];
-extern unsigned char WPA_TKIP_CIPHER[4];
-
 #define R2T_PHY_DELAY  (0)
 
 /* define WAIT_FOR_BCN_TO_MIN  (3000) */
-- 
2.20.1

[PATCH v2 7/9] staging: rtl8723bs: remove undefined function prototype in of os_dep/sdio_intf.c

[Fabio Aiuto]

fix the following checkpatch issue:

WARNING: externs should be avoided in .c files
486: FILE: drivers/staging/rtl8723bs/os_dep/sdio_intf.c:486:
+extern int pm_netdev_close(struct net_device *pnetdev, u8 bnormal);

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 8f8549eee23e..185919b6963f 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -483,7 +483,6 @@ static void rtw_dev_remove(struct sdio_func *func)
 }
 
 extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
-extern int pm_netdev_close(struct net_device *pnetdev, u8 bnormal);
 
 static int rtw_sdio_suspend(struct device *dev)
 {
-- 
2.20.1

[PATCH v2 6/9] staging: rtl8723bs: move function prototypes out of os_dep/int_fs.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
196: FILE: drivers/staging/rtl8723bs/os_dep/os_intfs.c:196:
+int _netdev_open(struct net_device *pnetdev);
--
WARNING: externs should be avoided in .c files
197: FILE: drivers/staging/rtl8723bs/os_dep/os_intfs.c:197:
+int netdev_open(struct net_device *pnetdev);

moved function prototype in include/osdep_intf.h
removed function prototype and made a static
removed unnecessary extern declaration in os_dep/ioctl_cfg80211.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/include/osdep_intf.h| 2 ++
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 --
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h 
b/drivers/staging/rtl8723bs/include/osdep_intf.h
index 5ad85416c598..48c90f00cc2e 100644
--- a/drivers/staging/rtl8723bs/include/osdep_intf.h
+++ b/drivers/staging/rtl8723bs/include/osdep_intf.h
@@ -69,4 +69,6 @@ void rtw_ndev_destructor(struct net_device *ndev);
 int rtw_suspend_common(struct adapter *padapter);
 int rtw_resume_common(struct adapter *padapter);
 
+int netdev_open(struct net_device *pnetdev);
+
 #endif /* _OSDEP_INTF_H_ */
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index a577ddcce8cd..03a784558d79 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1259,8 +1259,6 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
return ret;
 }
 
-extern int netdev_open(struct net_device *pnetdev);
-
 static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 struct net_device *ndev,
 enum nl80211_iftype type,
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c 
b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 9ae7d46fb501..c6c5cc0a9e08 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -193,8 +193,6 @@ MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 
1:Enable, 2: Depend on efuse
 module_param(rtw_tx_pwr_by_rate, int, 0644);
 MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on 
efuse");
 
-int _netdev_open(struct net_device *pnetdev);
-int netdev_open(struct net_device *pnetdev);
 static int netdev_close(struct net_device *pnetdev);
 
 static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
@@ -875,7 +873,7 @@ int rtw_drv_register_netdev(struct adapter *if1)
return _rtw_drv_register_netdev(padapter, name);
 }
 
-int _netdev_open(struct net_device *pnetdev)
+static int _netdev_open(struct net_device *pnetdev)
 {
uint status;
struct adapter *padapter = rtw_netdev_priv(pnetdev);
-- 
2.20.1

[PATCH v2 8/9] staging: rtl8723bs: remove unnecessary extern in os_dep/sdio_intf.c

[Fabio Aiuto]

remove unnecessary extern.

The function is defined static in os_dep/os_intfs.c and used only once
in the same file

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 185919b6963f..156ad91d33ee 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -482,8 +482,6 @@ static void rtw_dev_remove(struct sdio_func *func)
RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("-rtw_dev_remove\n"));
 }
 
-extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
-
 static int rtw_sdio_suspend(struct device *dev)
 {
struct sdio_func *func = dev_to_sdio_func(dev);
-- 
2.20.1

[PATCH v2 9/9] staging: rtl8723bs: remove blank line os_dep/os_intfs.c

[Fabio Aiuto]

remove blank line

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c 
b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index c6c5cc0a9e08..405aa95af579 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1027,7 +1027,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_deinit(padapter);
 }
 
-
 static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
 {
int status = -1;
-- 
2.20.1

[PATCH v2 5/9] staging: rtl8723bs: remove function prototypes in hal/odm.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
285: FILE: drivers/staging/rtl8723bs/hal/odm.c:285:
+void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
287: FILE: drivers/staging/rtl8723bs/hal/odm.c:287:
+void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
289: FILE: drivers/staging/rtl8723bs/hal/odm.c:289:
+void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
291: FILE: drivers/staging/rtl8723bs/hal/odm.c:291:
+void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
305: FILE: drivers/staging/rtl8723bs/hal/odm.c:305:
+void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
309: FILE: drivers/staging/rtl8723bs/hal/odm.c:309:
+void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
311: FILE: drivers/staging/rtl8723bs/hal/odm.c:311:
+void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
313: FILE: drivers/staging/rtl8723bs/hal/odm.c:313:
+void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
315: FILE: drivers/staging/rtl8723bs/hal/odm.c:315:
+void odm_SwAntDetectInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
317: FILE: drivers/staging/rtl8723bs/hal/odm.c:317:
+void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
--
WARNING: externs should be avoided in .c files
321: FILE: drivers/staging/rtl8723bs/hal/odm.c:321:
+void odm_GlobalAdapterCheck(void);
--
WARNING: externs should be avoided in .c files
323: FILE: drivers/staging/rtl8723bs/hal/odm.c:323:
+void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
325: FILE: drivers/staging/rtl8723bs/hal/odm.c:325:
+void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
327: FILE: drivers/staging/rtl8723bs/hal/odm.c:327:
+void odm_RateAdaptiveMaskInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
330: FILE: drivers/staging/rtl8723bs/hal/odm.c:330:
+void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
338: FILE: drivers/staging/rtl8723bs/hal/odm.c:338:
+void odm_InitHybridAntDiv(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
340: FILE: drivers/staging/rtl8723bs/hal/odm.c:340:
+bool odm_StaDefAntSel(
--
WARNING: externs should be avoided in .c files
349: FILE: drivers/staging/rtl8723bs/hal/odm.c:349:
+void odm_SetRxIdleAnt(struct dm_odm_t *pDM_Odm, u8 Ant, bool bDualPath);
--
WARNING: externs should be avoided in .c files
353: FILE: drivers/staging/rtl8723bs/hal/odm.c:353:
+void odm_HwAntDiv(struct dm_odm_t *pDM_Odm);

removed function prototypes  and made staics where needed
in hal/odm.c

moved function definition in file to let the compiler work

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/odm.c | 1717 +--
 1 file changed, 824 insertions(+), 893 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/odm.c 
b/drivers/staging/rtl8723bs/hal/odm.c
index 49d552105a65..3d92eee3a840 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -279,1126 +279,1057 @@ u32 TxScalingTable_Jaguar[TXSCALE_TABLE_SIZE] = {
0x3FE  /*  36, +6.0dB */
 };
 
-/*  Local Function predefine. */
-
-/* STARTCOMMON INFO RELATED--- */
-void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm);
-
-void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm);
+/* Remove Edca by Yu Chen */
 
-void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm);
 
-void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm);
+#define RxDefaultAnt1  0x65a9
+#define RxDefaultAnt2  0x569a
 
-/* ENDCOMMON INFO RELATED--- */
+static void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm)
+{
+   pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, 
ODM_REG(CCK_RPT_FORMAT, pDM_Odm), ODM_BIT(CCK_RPT_FORMAT, pDM_Odm));
+   pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, 
ODM_REG(BB_RX_PATH, pDM_Odm), ODM_BIT(BB_RX_PATH, pDM_Odm));
 
-/* START---DIG--- */
+   ODM_InitDebugSetting(pDM_Odm);
 
-/* Remove by Yuchen */
+   pDM_Odm->TxRate = 0xFF;
+}
 
-/* END---DIG--- */
+static void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm)
+{
+   u8 EntryCnt = 0;
+   u8 i;
+   PSTA_INFO_T pEntry;
 
-/* START---BB POWER SAVE--- */
-/* Remove BB power Saving by YuChen */
-/* END-BB POWER SAVE--- */
+   if (*(pDM_

Re: [PATCH 02/11] staging: rtl8723bs: moved function prototypes out of core/rtw_efuse.c

[Fabio Aiuto]

On Mon, Mar 22, 2021 at 10:29:27PM +0300, Dan Carpenter wrote:
> On Mon, Mar 22, 2021 at 03:31:40PM +0100, Fabio Aiuto wrote:
> > fix the following checkpatch issues:
> > 
> > WARNING: externs should be avoided in .c files
> > 35: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:35:
> > +bool
> > 
> > moved two function prototypes in include/rtw_efuse.h
> 
> Can't you just make these functions static instead?
> 
> regards,
> dan carpenter
> 

Hi Dan,

sorry for my recent spamming, I forgot to cc you in my
patchset v2 submit.

Thank you,

fabio

[PATCH] staging: rtl8723bs: removed unused code block

[Fabio Aiuto]

Removed conditional code block checked by unused CONFIG_TX_BCAST2UNI

This patch does the cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c 
b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
index 1c23fbe58881..a89b88eaed39 100644
--- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
@@ -212,9 +212,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
&& check_fwstate(pmlmepriv, WIFI_AP_STATE) == true
&& (IP_MCAST_MAC(pkt->data)
|| ICMPV6_MCAST_MAC(pkt->data)
-   #ifdef CONFIG_TX_BCAST2UNI
-   || is_broadcast_mac_addr(pkt->data)
-   #endif
)
&& padapter->registrypriv.wifi_spec == 0) {
if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME / 4)) {
-- 
2.20.1

[PATCH 0/2] staging: rtl8723bs: replace private macro with print_hex_dump_debug

[Fabio Aiuto]

this patchset replaces RT_PRINT_DATA private macro for dump hex values
with the kernel helper used for this pourpose.

Fabio Aiuto (2):
  staging: rtl8723bs: use print_hex_dump_debug instead of private
RT_PRINT_DATA
  staging: rtl8723bs: remove unused macro RT_PRINT_DATA

 drivers/staging/rtl8723bs/hal/hal_com.c   | 13 ---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 22 ++-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  3 ++-
 drivers/staging/rtl8723bs/include/rtw_debug.h | 19 
 4 files changed, 22 insertions(+), 35 deletions(-)

-- 
2.20.1

[PATCH 2/2] staging: rtl8723bs: remove unused macro RT_PRINT_DATA

[Fabio Aiuto]

remove unused macro declaration: RT_PRINT_DATA

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/include/rtw_debug.h | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_debug.h 
b/drivers/staging/rtl8723bs/include/rtw_debug.h
index d1c557818305..4c0857241922 100644
--- a/drivers/staging/rtl8723bs/include/rtw_debug.h
+++ b/drivers/staging/rtl8723bs/include/rtw_debug.h
@@ -231,25 +231,6 @@
} while (0)
 
 #endif /* defined(_dbgdump) && defined(_MODULE_DEFINE_) */
-
-
-#ifdefined(_dbgdump)
-   #undef RT_PRINT_DATA
-   #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, 
_HexDataLen)   \
-   if (((_Comp) & GlobalDebugComponents) && (_Level <= 
GlobalDebugLevel))  \
-   {   
\
-   int __i;
\
-   u8 *ptr = (u8 *)_HexData;   
\
-   _dbgdump("%s", DRIVER_PREFIX);  
\
-   _dbgdump(_TitleString); 
\
-   for (__i = 0; __i < (int)_HexDataLen; __i++)
\
-   {   
\
-   _dbgdump("%02X%s", ptr[__i], (((__i + 1) % 4) 
== 0)?"  ":" ");  \
-   if (((__i + 1) % 16) == 0)  _dbgdump("\n"); 
\
-   }   
\
-   _dbgdump("\n"); 
\
-   }
-#endif /* defined(_dbgdump) */
 #endif /* DEBUG_RTL871X */
 
 void dump_drv_version(void *sel);
-- 
2.20.1

[PATCH 1/2] staging: rtl8723bs: use print_hex_dump_debug instead of private RT_PRINT_DATA

[Fabio Aiuto]

replace private macro RT_PRINT_DATA with in-kernel helper
print_hex_dump_debug

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/hal_com.c   | 13 ---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 22 ++-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  3 ++-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c 
b/drivers/staging/rtl8723bs/hal/hal_com.c
index 98a363698843..e74d7e21372d 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -924,13 +924,8 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
c2h_evt->seq = rtw_read8(adapter, REG_C2HEVT_CMD_SEQ_88XX);
c2h_evt->plen = rtw_read8(adapter, REG_C2HEVT_CMD_LEN_88XX);
 
-   RT_PRINT_DATA(
-   _module_hal_init_c_,
-   _drv_info_,
-   "c2h_evt_read(): ",
-   &c2h_evt,
-   sizeof(c2h_evt)
-   );
+   print_hex_dump_debug(DRIVER_PREFIX ": c2h_evt_read(): ", 
DUMP_PREFIX_NONE,
+16, 1, &c2h_evt, sizeof(c2h_evt), false);
 
DBG_871X(
"%s id:%u, len:%u, seq:%u, trigger:0x%02x\n",
@@ -945,8 +940,8 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf)
for (i = 0; i < c2h_evt->plen; i++)
c2h_evt->payload[i] = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL 
+ 2 + i);
 
-   RT_PRINT_DATA(_module_hal_init_c_, _drv_info_, "c2h_evt_read(): Command 
Content:\n",
-   c2h_evt->payload, c2h_evt->plen);
+   print_hex_dump_debug(DRIVER_PREFIX ": c2h_evt_read(): Command 
Content:\n",
+DUMP_PREFIX_NONE, 16, 1, c2h_evt->payload, 
c2h_evt->plen, false);
 
ret = _SUCCESS;
 
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index 202974ccb739..88f908fd14e3 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -336,7 +336,9 @@ static void rtl8723b_set_FwRsvdPage_cmd(struct adapter 
*padapter, struct rsvdpag
SET_8723B_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(u1H2CRsvdPageParm, 
rsvdpageloc->LocQosNull);
SET_8723B_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(u1H2CRsvdPageParm, 
rsvdpageloc->LocBTQosNull);
 
-   RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, "u1H2CRsvdPageParm:", 
u1H2CRsvdPageParm, H2C_RSVDPAGE_LOC_LEN);
+   print_hex_dump_debug(DRIVER_PREFIX ": u1H2CRsvdPageParm:", 
DUMP_PREFIX_NONE,
+16, 1, u1H2CRsvdPageParm, H2C_RSVDPAGE_LOC_LEN, 
false);
+
FillH2CCmd8723B(padapter, H2C_8723B_RSVD_PAGE, H2C_RSVDPAGE_LOC_LEN, 
u1H2CRsvdPageParm);
 }
 
@@ -356,7 +358,9 @@ void rtl8723b_set_FwMediaStatusRpt_cmd(struct adapter 
*padapter, u8 mstatus, u8
SET_8723B_H2CCMD_MSRRPT_PARM_MACID(u1H2CMediaStatusRptParm, macid);
SET_8723B_H2CCMD_MSRRPT_PARM_MACID_END(u1H2CMediaStatusRptParm, 
macid_end);
 
-   RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, 
"u1H2CMediaStatusRptParm:", u1H2CMediaStatusRptParm, H2C_MEDIA_STATUS_RPT_LEN);
+   print_hex_dump_debug(DRIVER_PREFIX ": u1H2CMediaStatusRptParm:", 
DUMP_PREFIX_NONE,
+16, 1, u1H2CMediaStatusRptParm, 
H2C_MEDIA_STATUS_RPT_LEN, false);
+
FillH2CCmd8723B(padapter, H2C_8723B_MEDIA_STATUS_RPT, 
H2C_MEDIA_STATUS_RPT_LEN, u1H2CMediaStatusRptParm);
 }
 
@@ -375,7 +379,9 @@ void rtl8723b_set_FwMacIdConfig_cmd(struct adapter 
*padapter, u8 mac_id, u8 raid
SET_8723B_H2CCMD_MACID_CFG_RATE_MASK2(u1H2CMacIdConfigParm, (u8)((mask 
& 0x00ff) >> 16));
SET_8723B_H2CCMD_MACID_CFG_RATE_MASK3(u1H2CMacIdConfigParm, (u8)((mask 
& 0xff00) >> 24));
 
-   RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, 
"u1H2CMacIdConfigParm:", u1H2CMacIdConfigParm, H2C_MACID_CFG_LEN);
+   print_hex_dump_debug(DRIVER_PREFIX ": u1H2CMacIdConfigParm:", 
DUMP_PREFIX_NONE,
+16, 1, u1H2CMacIdConfigParm, H2C_MACID_CFG_LEN, 
false);
+
FillH2CCmd8723B(padapter, H2C_8723B_MACID_CFG, H2C_MACID_CFG_LEN, 
u1H2CMacIdConfigParm);
 }
 
@@ -393,7 +399,9 @@ void rtl8723b_set_rssi_cmd(struct adapter *padapter, u8 
*param)
SET_8723B_H2CCMD_RSSI_SETTING_RSSI(u1H2CRssiSettingParm, rssi);
SET_8723B_H2CCMD_RSSI_SETTING_ULDL_STATE(u1H2CRssiSettingParm, 
uldl_state);
 
-   RT_PRINT_DATA(_module_hal_init_c_, _drv_notice_, 
"u1H2CRssiSettingParm:", u1H2CRssiSettingParm, H2C_RSSI_SETTING_LEN);
+   print_hex_dump_debug(DRIVER_PREFIX ": u1H2CRssiSettingParm:", 
DUMP_PREFIX_NONE,
+16, 1, u1H2CRssiSettingParm, H2C_RSSI_SETTING_LEN, 
false);
+
FillH2CCmd8723B(padapter, H2C_8723B_RSSI_SETTING, H2C_RSSI_SE

[PATCH 01/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_xmit.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_xmit.c | 168 +++---
 1 file changed, 113 insertions(+), 55 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c 
b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 2daf5c461a4d..6ea8d4ae90d1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -69,7 +69,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct 
adapter *padapter)
 
if (!pxmitpriv->pallocated_frame_buf) {
pxmitpriv->pxmit_frame_buf = NULL;
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_frame 
fail!\n"));
+   pr_err("%s alloc xmit_frame fail!\n", DRIVER_PREFIX);
res = _FAIL;
goto exit;
}
@@ -105,7 +105,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct 
adapter *padapter)
pxmitpriv->pallocated_xmitbuf = vzalloc(NR_XMITBUFF * sizeof(struct 
xmit_buf) + 4);
 
if (!pxmitpriv->pallocated_xmitbuf) {
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xmit_buf 
fail!\n"));
+   pr_err("%s alloc xmit_buf fail!\n", DRIVER_PREFIX);
res = _FAIL;
goto exit;
}
@@ -155,7 +155,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct 
adapter *padapter)
 
if (!pxmitpriv->xframe_ext_alloc_addr) {
pxmitpriv->xframe_ext = NULL;
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc xframe_ext 
fail!\n"));
+   pr_err("%s alloc xframe_ext fail!\n", DRIVER_PREFIX);
res = _FAIL;
goto exit;
}
@@ -188,7 +188,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct 
adapter *padapter)
pxmitpriv->pallocated_xmit_extbuf = vzalloc(NR_XMIT_EXTBUFF * 
sizeof(struct xmit_buf) + 4);
 
if (!pxmitpriv->pallocated_xmit_extbuf) {
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("alloc 
xmit_extbuf fail!\n"));
+   pr_err("%s alloc xmit_extbuf fail!\n", DRIVER_PREFIX);
res = _FAIL;
goto exit;
}
@@ -481,12 +481,13 @@ static s32 update_attrib_sec_info(struct adapter 
*padapter, struct pkt_attrib *p
pattrib->mac_id = psta->mac_id;
 
if (psta->ieee8021x_blocked == true) {
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\n 
psta->ieee8021x_blocked == true\n"));
+   pr_err("%s psta->ieee8021x_blocked == true\n", DRIVER_PREFIX);
 
pattrib->encrypt = 0;
 
if ((pattrib->ether_type != 0x888e) && 
(check_fwstate(pmlmepriv, WIFI_MP_STATE) == false)) {
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 
("\npsta->ieee8021x_blocked == true,  pattrib->ether_type(%.4x) != 0x888e\n", 
pattrib->ether_type));
+   pr_err("%s psta->ieee8021x_blocked == true,  
pattrib->ether_type(%.4x) != 0x888e\n",
+  DRIVER_PREFIX, pattrib->ether_type);
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked 
== true,  pattrib->ether_type(%04x) != 0x888e\n", __func__, 
pattrib->ether_type);
#endif
@@ -568,19 +569,17 @@ static s32 update_attrib_sec_info(struct adapter 
*padapter, struct pkt_attrib *p
if (pattrib->encrypt > 0)
memcpy(pattrib->dot118021x_UncstKey.skey, 
psta->dot118021x_UncstKey.skey, 16);
 
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
-   ("update_attrib: encrypt =%d  securitypriv.sw_encrypt =%d\n",
-   pattrib->encrypt, padapter->securitypriv.sw_encrypt));
+   pr_info("%s update_attrib: encrypt =%d  securitypriv.sw_encrypt =%d\n", 
DRIVER_PREFIX,
+   pattrib->encrypt, padapter->securitypriv.sw_encrypt);
 
if (pattrib->encrypt &&
((padapter->securitypriv.sw_encrypt == true) || 
(psecuritypriv->hw_decrypted == false))) {
pattrib->bswenc = true;
-   RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
-   ("update_attrib: encrypt =%d securitypriv.hw_decrypted 
=%d bswenc =true\n",
-   pattrib->encrypt, padapter->securitypriv.sw_encrypt));
+   pr_err("%s update_attrib: encrypt =%d securitypriv.hw_decrypted 
=%d bswenc =true\n",
+  DRIVER_PREFIX, pattrib->encrypt, 
padapter->securitypriv.sw_encrypt);
} else {
pattrib->bswe

[PATCH 04/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_pwrctrl.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 62 +---
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c 
b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 8bf80e6f4a11..da967e819fcf 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -268,16 +268,16 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
} else {
if ((pwrpriv->rpwm == pslv)
|| ((pwrpriv->rpwm >= PS_STATE_S2) && (pslv >= 
PS_STATE_S2))) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
-   ("%s: Already set rpwm[0x%02X], new = 
0x%02X!\n", __func__, pwrpriv->rpwm, pslv));
+   pr_err("%s %s: Already set rpwm[0x%02X], new = 
0x%02X!\n",
+  DRIVER_PREFIX, __func__, pwrpriv->rpwm, pslv);
return;
}
}
 
if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
-("%s: SurpriseRemoved(%d) 
hw_init_completed(%d)\n",
- __func__, padapter->bSurpriseRemoved, 
padapter->hw_init_completed));
+   pr_err("%s %s: SurpriseRemoved(%d) hw_init_completed(%d)\n",
+  DRIVER_PREFIX, __func__, padapter->bSurpriseRemoved,
+  padapter->hw_init_completed);
 
pwrpriv->cpwm = PS_STATE_S4;
 
@@ -285,12 +285,12 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
}
 
if (padapter->bDriverStopped) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
-("%s: change power state(0x%02X) when 
DriverStopped\n", __func__, pslv));
+   pr_err("%s %s: change power state(0x%02X) when DriverStopped\n",
+  DRIVER_PREFIX, __func__, pslv);
 
if (pslv < PS_STATE_S2) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,
-("%s: Reject to enter PS_STATE(0x%02X) 
lower than S2 when DriverStopped!!\n", __func__, pslv));
+   pr_err("%s %s: Reject to enter PS_STATE(0x%02X) lower 
than S2 when DriverStopped!!\n",
+  DRIVER_PREFIX, __func__, pslv);
return;
}
}
@@ -299,8 +299,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
/*  only when from PS_STATE S0/S1 to S2 and higher needs ACK */
if ((pwrpriv->cpwm < PS_STATE_S2) && (pslv >= PS_STATE_S2))
rpwm |= PS_ACK;
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
-("rtw_set_rpwm: rpwm = 0x%02x cpwm = 0x%02x\n", rpwm, 
pwrpriv->cpwm));
+   pr_notice("%s %s: rpwm = 0x%02x cpwm = 0x%02x\n", DRIVER_PREFIX,
+ __func__, rpwm, pwrpriv->cpwm);
 
pwrpriv->rpwm = pslv;
 
@@ -382,12 +382,11 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 
ps_mode, u8 smart_ps, u8 bcn_a
 {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
 
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
-("%s: PowerMode =%d Smart_PS =%d\n",
- __func__, ps_mode, smart_ps));
+   pr_notice("%s %s: PowerMode =%d Smart_PS =%d\n", DRIVER_PREFIX,
+ __func__, ps_mode, smart_ps);
 
if (ps_mode > PM_Card_Disable) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("ps_mode:%d 
error\n", ps_mode));
+   pr_err("%s ps_mode:%d error\n", DRIVER_PREFIX, ps_mode);
return;
}
 
@@ -701,8 +700,7 @@ void cpwm_int_hdl(struct adapter *padapter, struct 
reportpwrstate_parm *preportp
 exit:
mutex_unlock(&pwrpriv->lock);
 
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
-("cpwm_int_hdl: cpwm = 0x%02x\n", pwrpriv->cpwm));
+   pr_notice("%s %s: cpwm = 0x%02x\n", DRIVER_PREFIX, __func__, 
pwrpriv->cpwm);
 }
 
 static void cpwm_event_callback(struct work_struct *work)
@@ -817,9 +815,8 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 
task)
register_task_alive(pwrctrl, task);
 
if (pwrctrl->bFwCurrentInPSMode) {
-   RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
-("%s: task = 0x%x cpwm = 0x%02x alives = 
0x%08x\n",
- 

[PATCH 02/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_security.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 38 ---
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c 
b/drivers/staging/rtl8723bs/core/rtw_security.c
index 8a447e149438..5bdde7b8de01 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -237,14 +237,13 @@ void rtw_wep_decrypt(struct adapter  *padapter, u8 
*precvframe)
*((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));
 
if (crc[3] != payload[length-1] || crc[2] != payload[length-2] 
|| crc[1] != payload[length-3] || crc[0] != payload[length-4]) {
-   RT_TRACE(_module_rtl871x_security_c_,
-_drv_err_,
-("%s:icv error 
crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || 
crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
+   pr_err("%s %s:icv error 
crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || 
crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
+   DRIVER_PREFIX,
__func__,
crc[3], payload[length - 1],
crc[2], payload[length - 2],
crc[1], payload[length - 3],
-   crc[0], payload[length - 4]));
+   crc[0], payload[length - 4]);
}
}
 }
@@ -609,7 +608,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 
*pxmitframe)
if (pattrib->encrypt == _TKIP_) {
 
{
-   RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: 
stainfo!= NULL!!!\n", __func__));
+   pr_err("%s %s: stainfo!= NULL!!!\n", DRIVER_PREFIX, 
__func__);
 
if (IS_MCAST(pattrib->ra))
prwskey = 
psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
@@ -631,7 +630,8 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 
*pxmitframe)
 
if ((curfragnum+1) == pattrib->nr_frags) {  
/* 4 the last fragment */
length = 
pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-   RT_TRACE(_module_rtl871x_security_c_, 
_drv_info_, ("pattrib->iv_len =%x, pattrib->icv_len =%x\n", pattrib->iv_len, 
pattrib->icv_len));
+   pr_info("%s %s: pattrib->iv_len =%x, 
pattrib->icv_len =%x\n",
+   DRIVER_PREFIX, __func__, 
pattrib->iv_len, pattrib->icv_len);
*((__le32 *)crc) = getcrc32(payload, 
length);/* modified by Amy*/
 
arcfour_init(&mycontext, rc4key, 16);
@@ -740,17 +740,16 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 
*precvframe)
*((u32 *)crc) = le32_to_cpu(getcrc32(payload, 
length-4));
 
if (crc[3] != payload[length-1] || crc[2] != 
payload[length-2] || crc[1] != payload[length-3] || crc[0] != 
payload[length-4]) {
-   RT_TRACE(_module_rtl871x_security_c_,
-_drv_err_,
-("rtw_wep_decrypt:icv error 
crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || 
crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
+   pr_err("%s %s:icv error 
crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || 
crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
+   DRIVER_PREFIX, __func__,
crc[3], payload[length - 1],
crc[2], payload[length - 2],
crc[1], payload[length - 3],
-   crc[0], payload[length - 4]));
+   crc[0], payload[length - 4]);
res = _FAIL;
}
} else {
-   RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: 
stainfo == NULL!!!\n", __func__));
+   pr_err("%s %s: stainfo == NULL!!!\n", DRIVER_PREFIX, 
__func__);
   

[PATCH 00/40] staging: rtl8723bs: replace RT_TRACE private macro

[Fabio Aiuto]

this patchset replace all RT_TRACE usages with public log functions
used for this pourpose

Fabio Aiuto (40):
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_xmit.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_security.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_eeprom.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_pwrctrl.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_cmd.c
  staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_mlme.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_mlme_ext.c
  staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_recv.c
  staging: rtl8723bs: remove commented RT_TRACE call in
core/rtw_ioctl_set.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_ioctl_set.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_wlan_util.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_sta_mgt.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
core/rtw_ieee80211.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/HalPwrSeqCmd.c
  staging: rtl8723bs: fix constant name in hal/rtl8723b_hal_init.c
  staging: rtl8723bs: added driver prefix in log messages
  staging: rtl8723bs: remove commented RT_TRACE call in
hal/rtl8723b_hal_init.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/rtl8723b_hal_init.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/sdio_ops.c
  staging: rtl8723bs: remove commented code block in
hal/hal_com_phycfg.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/rtl8723b_phycfg.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/hal_intf.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/rtl8723bs_xmit.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/sdio_halinit.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
hal/rtl8723bs_recv.c
  staging: rtl8723bs: remove commented RT_TRACE calls in
hal/HalPhyRf_8723B.c
  staging: rtl8723bs: remove commented RT_TRACE calls in
hal/rtl8723b_rf6052.c
  staging: rtl8723bs: remove commented RT_TRACE calls in
os_dep/ioctl_linux.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/ioctl_linux.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/mlme_linux.c
  staging: rtl8723bs: fix string format in os_dep/ioctl_cfg80211.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/ioctl_cfg80211.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/os_intfs.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/recv_linux.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/sdio_intf.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/xmit_linux.c
  staging: rtl8723bs: replace RT_TRACE with public printk wrappers in
os_dep/osdep_service.c
  staging: rtl8723bs: remove obsolete debug macro

 drivers/staging/rtl8723bs/core/rtw_cmd.c  |  55 ++--
 drivers/staging/rtl8723bs/core/rtw_eeprom.c   |  26 +-
 .../staging/rtl8723bs/core/rtw_ieee80211.c| 116 +---
 .../staging/rtl8723bs/core/rtw_ioctl_set.c| 129 +
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 128 +
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c |  39 +--
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c  |  62 ++---
 drivers/staging/rtl8723bs/core/rtw_recv.c | 252 +++---
 drivers/staging/rtl8723bs/core/rtw_security.c |  38 ++-
 drivers/staging/rtl8723bs/core/rtw_sta_mgt.c  |  45 ++--
 .../staging/rtl8723bs/core/rtw_wlan_util.c|  28 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c | 168 
 .../staging/rtl8723bs/hal/HalPhyRf_8723B.c|   3 -
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c  |  61 ++---
 .../staging/rtl8723bs/hal/hal_com_phycfg.c|  20 --
 drivers/staging/rtl8723bs/hal/hal_intf.c  |   2 +-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 155 +--
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   |  48 ++--
 .../staging/rtl8723bs/hal/rtl8723b_rf6052.c   |   2 -
 .../staging/rtl8723bs/hal/rtl8723bs_recv.c|   5 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c|  42 +--
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  |  49 ++--
 drivers/staging/rtl8723bs/hal/sdio_ops.c  |  42 +--
 drivers/staging/rtl8723bs/include

[PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++---
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
index 3cbd65dee741..6176d741d60e 100644
--- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
+++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
@@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 count)
 _func_enter_;
 
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
mask = 0x01 << (count - 1);
@@ -49,8 +49,8 @@ _func_enter_;
if (data & mask)
x |= _EEDI;
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
-   goto out;
+   pr_err("%s padapter->bSurpriseRemoved==true", 
DRIVER_PREFIX);
+   goto out;
}
rtw_write8(padapter, EE_9346CR, (u8)x);
udelay(CLOCK_RATE);
@@ -59,7 +59,7 @@ _func_enter_;
mask = mask >> 1;
} while (mask);
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
x &= ~_EEDI;
@@ -73,7 +73,7 @@ u16 shift_in_bits(_adapter *padapter)
u16 x, d = 0, i;
 _func_enter_;
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
x = rtw_read8(padapter, EE_9346CR);
@@ -85,7 +85,7 @@ _func_enter_;
d = d << 1;
up_clk(padapter, &x);
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
x = rtw_read8(padapter, EE_9346CR);
@@ -123,23 +123,23 @@ void eeprom_clean(_adapter *padapter)
u16 x;
 _func_enter_;
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
x = rtw_read8(padapter, EE_9346CR);
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
x &= ~(_EECS | _EEDI);
rtw_write8(padapter, EE_9346CR, (u8)x);
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
up_clk(padapter, &x);
-   if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   if (padapter->bSurpriseRemoved == true) {
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
down_clk(padapter, &x);
@@ -156,14 +156,14 @@ u16 eeprom_read16(_adapter *padapter, u16 reg) 
/*ReadEEprom*/
 _func_enter_;
 
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
/* select EEPROM, reset bits, set _EECS*/
x = rtw_read8(padapter, EE_9346CR);
 
if (padapter->bSurpriseRemoved == true) {
-   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
("padapter->bSurpriseRemoved==true"));
+   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
goto out;
}
 
-- 
2.20.1

[PATCH 08/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_mlme_ext.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 39 ++-
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 8aadcf72a7ba..9ed216c58fa0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -526,12 +526,12 @@ void mgt_dispatcher(struct adapter *padapter, union 
recv_frame *precv_frame)
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
-("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",
- GetFrameType(pframe), GetFrameSubType(pframe)));
+   pr_info("%s+%s: type(0x%x) subtype(0x%x)\n", DRIVER_PREFIX, __func__,
+   GetFrameType(pframe), GetFrameSubType(pframe));
 
if (GetFrameType(pframe) != WIFI_MGT_TYPE) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher: 
type(0x%x) error!\n", GetFrameType(pframe)));
+   pr_err("%s %s: type(0x%x) error!\n", DRIVER_PREFIX, __func__,
+  GetFrameType(pframe));
return;
}
 
@@ -546,7 +546,8 @@ void mgt_dispatcher(struct adapter *padapter, union 
recv_frame *precv_frame)
index = GetFrameSubType(pframe) >> 4;
 
if (index >= ARRAY_SIZE(mlme_sta_tbl)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Currently we do 
not support reserved sub-fr-type =%d\n", index));
+   pr_err("%s Currently we do not support reserved sub-fr-type 
=%d\n",
+  DRIVER_PREFIX, index);
return;
}
ptable += index;
@@ -2675,7 +2676,7 @@ static int _issue_probereq(struct adapter *padapter,
int bssrate_len = 0;
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+issue_probereq\n"));
+   pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
 
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe)
@@ -2743,7 +2744,8 @@ static int _issue_probereq(struct adapter *padapter,
 
pattrib->last_txcmdsz = pattrib->pktlen;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("issuing probe_req, 
tx_len =%d\n", pattrib->last_txcmdsz));
+   pr_notice("%s issuing probe_req, tx_len =%d\n",
+ DRIVER_PREFIX, pattrib->last_txcmdsz);
 
if (wait_ack) {
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
@@ -4441,7 +4443,7 @@ void start_create_ibss(struct adapter *padapter)
 
/* issue beacon */
if (send_beacon(padapter) == _FAIL) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("issuing 
beacon frame fail\n"));
+   pr_err("%s issuing beacon frame fail\n", 
DRIVER_PREFIX);
 
report_join_res(padapter, -1);
pmlmeinfo->state = WIFI_FW_NULL_STATE;
@@ -4622,8 +4624,8 @@ static void process_80211d(struct adapter *padapter, 
struct wlan_bssid_ex *bssid
memset(country, 0, 4);
memcpy(country, p, 3);
p += 3;
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
-   ("%s: 802.11d country =%s\n", __func__, 
country));
+   pr_notice("%s %s: 802.11d country =%s\n", DRIVER_PREFIX,
+ __func__, country);
 
i = 0;
while ((ie - p) >= 3) {
@@ -4813,9 +4815,8 @@ static void process_80211d(struct adapter *padapter, 
struct wlan_bssid_ex *bssid
break;
 
chplan_new[i].ScanType = SCAN_ACTIVE;
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
-("%s: change channel %d scan 
type from passive to active\n",
- __func__, channel));
+   pr_notice("%s %s: change channel %d scan type 
from passive to active\n",
+ DRIVER_PREFIX, __func__, channel);
}
break;
}
@@ -6332,9 +6333,9 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char 
*pbuf)
#ifdef CHECK_EVENT_SEQ
/*  checking event sequence... */
if (evt_seq != (atomic_read(&pevt_priv->event_seq) & 0x7f)) {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_in

[PATCH 06/40] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c

[Fabio Aiuto]

remove commented RT_TRACE calls in core/rtw_mlme.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 29d4b7493784..4289bf40aa73 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -356,7 +356,6 @@ static struct   wlan_network 
*rtw_dequeue_network(struct __queue *queue)
 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network 
*pnetwork);
 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network 
*pnetwork)
 {
-   /* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_network ==> 
ssid = %s\n\n" , pnetwork->network.Ssid.Ssid)); */
_rtw_free_network_nolock(&(padapter->mlmepriv), pnetwork);
rtw_cfg80211_unlink_bss(padapter, pnetwork);
 }
@@ -393,8 +392,6 @@ int rtw_is_same_ibss(struct adapter *adapter, struct 
wlan_network *pnetwork)
 
 inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
 {
-   /* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("(%s,%d)(%s,%d)\n", */
-   /*  a->Ssid.Ssid, a->Ssid.SsidLength, b->Ssid.Ssid, 
b->Ssid.SsidLength)); */
return (a->Ssid.SsidLength == b->Ssid.SsidLength)
&&  !memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength);
 }
@@ -551,8 +548,6 @@ static void update_current_network(struct adapter *adapter, 
struct wlan_bssid_ex
&(pmlmepriv->cur_network.network));
 
if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) && 
(is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0))) {
-   /* RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,"Same 
Network\n"); */
-
/* if (pmlmepriv->cur_network.network.IELength<= 
pnetwork->IELength) */
{
update_network(&(pmlmepriv->cur_network.network), 
pnetwork, adapter, true);
@@ -778,7 +773,6 @@ void rtw_survey_event_callback(struct adapter   
*adapter, u8 *pbuf)
 
/*  update IBSS_network 's timestamp */
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == true) {
-   /* RT_TRACE(_module_rtl871x_mlme_c_, 
_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE\n\n"); */
if (!memcmp(&(pmlmepriv->cur_network.network.MacAddress), 
pnetwork->MacAddress, ETH_ALEN)) {
struct wlan_network *ibss_wlan = NULL;
 
-- 
2.20.1

[PATCH 12/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_ioctl_set.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/core/rtw_ioctl_set.c| 126 ++
 1 file changed, 74 insertions(+), 52 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 14eb01df69b0..21409307bb66 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -28,7 +28,7 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
u8 ret = true;
 
if (ssid->SsidLength > 32) {
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length 
>32\n"));
+   pr_err("%s ssid length >32\n", DRIVER_PREFIX);
ret = false;
goto exit;
}
@@ -49,7 +49,8 @@ u8 rtw_do_join(struct adapter *padapter)
phead = get_list_head(queue);
plist = get_next(phead);
 
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("\n rtw_do_join: 
phead = %p; plist = %p\n\n\n", phead, plist));
+   pr_info("%s %s: phead = %p; plist = %p\n",
+   DRIVER_PREFIX, __func__, phead, plist);
 
pmlmepriv->cur_network.join_res = -2;
 
@@ -69,12 +70,14 @@ u8 rtw_do_join(struct adapter *padapter)
if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false
|| rtw_to_roam(padapter) > 0
) {
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, 
("rtw_do_join(): site survey if scanned_queue is empty\n."));
+   pr_info("%s %s: site survey if scanned_queue is 
empty\n.",
+   DRIVER_PREFIX, __func__);
/*  submit site_survey_cmd */
ret = rtw_sitesurvey_cmd(padapter, 
&pmlmepriv->assoc_ssid, 1, NULL, 0);
if (_SUCCESS != ret) {
pmlmepriv->to_join = false;
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, 
_drv_err_, ("rtw_do_join(): site survey return error\n."));
+   pr_err("%s %s: site survey return error\n.",
+  DRIVER_PREFIX, __func__);
}
} else {
pmlmepriv->to_join = false;
@@ -107,14 +110,16 @@ u8 rtw_do_join(struct adapter *padapter)
rtw_generate_random_ibss(pibss);
 
if (rtw_createbss_cmd(padapter) != _SUCCESS) {
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, 
_drv_err_, ("***Error =>do_goin: rtw_createbss_cmd status FAIL***\n "));
+   pr_err("%s ***Error => %s: 
rtw_createbss_cmd status FAIL***\n ",
+  DRIVER_PREFIX, __func__);
ret =  false;
goto exit;
}
 
pmlmepriv->to_join = false;
 
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, 
_drv_info_, ("***Error => rtw_select_and_join_from_scanned_queue FAIL under 
STA_Mode***\n "));
+   pr_info("%s ***Error => 
rtw_select_and_join_from_scanned_queue FAIL under STA_Mode***\n",
+   DRIVER_PREFIX);
 
} else {
/*  can't associate ; reset under-linking */
@@ -129,7 +134,8 @@ u8 rtw_do_join(struct adapter *padapter)
ret = rtw_sitesurvey_cmd(padapter, 
&pmlmepriv->assoc_ssid, 1, NULL, 0);
if (_SUCCESS != ret) {
pmlmepriv->to_join = false;
-   
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey 
return error\n."));
+   pr_err("%s %s: site survey 
return error\n.",
+  DRIVER_PREFIX, __func__);
}
} else {
ret = _FAIL;
@@ -169,15 +175,17 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 
*bssid)
goto release_mlme_lock;
 
if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == 
true) {
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: 
_FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));
+   pr_info("%s %s: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n",
+  

[PATCH 09/40] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c

[Fabio Aiuto]

remove commented RT_TRACE calls in core/rtw_recv.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c | 12 
 1 file changed, 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 608a59286505..189f686a1f29 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -588,13 +588,11 @@ static union recv_frame *portctrl(struct adapter 
*adapter, union recv_frame *pre
prtnframe = precv_frame;
/* check is the EAPOL frame or not (Rekey) */
/* if (ether_type == eapol_type) { */
-   /* RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, 
("portctrl:ether_type == 0x888e\n")); */
/* check Rekey */
 
/* prtnframe =precv_frame; */
/*  */
/* else { */
-   /* RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 
("portctrl:ether_type = 0x%04x\n", ether_type)); */
/*  */
}
} else
@@ -1693,7 +1691,6 @@ static signed int validate_recv_frame(struct adapter 
*adapter, union recv_frame
retval = validate_recv_data_frame(adapter, precv_frame);
if (retval == _FAIL) {
struct recv_priv *precvpriv = &adapter->recvpriv;
-   /* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 
("validate_recv_data_frame fail\n")); */
precvpriv->rx_drop++;
} else if (retval == _SUCCESS) {
 #ifdef DBG_RX_DUMP_EAP
@@ -1889,7 +1886,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl 
*preorder_ctrl, u16 seq_n
 
/*  Drop out the packet which SeqNum is smaller than WinStart */
if (SN_LESS(seq_num, preorder_ctrl->indicate_seq)) {
-   /* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, 
("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", 
pTS->RxIndicateSeq, NewSeqNum)); */
/* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: 
%d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
#ifdef DBG_RX_DROP_FRAME
@@ -1914,7 +1910,6 @@ static int check_indicate_seq(struct recv_reorder_ctrl 
*preorder_ctrl, u16 seq_n
preorder_ctrl->indicate_seq, seq_num);
#endif
} else if (SN_LESS(wend, seq_num)) {
-   /* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, 
("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", 
pTS->RxIndicateSeq, NewSeqNum)); */
/* DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: 
%d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
/*  boundary situation, when seq_num cross 0xFFF */
@@ -1959,7 +1954,6 @@ static int enqueue_reorder_recvframe(struct 
recv_reorder_ctrl *preorder_ctrl, un
plist = get_next(plist);
else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
/* Duplicate entry is found!! Do not insert current 
entry. */
-   /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, 
("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: 
%d\n", pTS->RxIndicateSeq, SeqNum)); */
/* 
spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
return false;
else
@@ -1980,8 +1974,6 @@ static int enqueue_reorder_recvframe(struct 
recv_reorder_ctrl *preorder_ctrl, un
/* spin_unlock(&ppending_recvframe_queue->lock); */
/* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
 
-
-   /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt 
insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, 
SeqNum)); */
return true;
 
 }
@@ -2437,8 +2429,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
struct recv_priv *precvpriv;
s32 ret = _SUCCESS;
 
-   /* RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 
("+rtw_recv_entry\n")); */
-
padapter = precvframe->u.hdr.adapter;
 
precvpriv = &padapter->recvpriv;
@@ -2456,8 +2446,6 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
 
 _recv_entry_drop:
 
-   /* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 
("_recv_entry_drop\n")); */
-
return ret;
 }
 
-- 
2.20.1

[PATCH 16/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/HalPwrSeqCmd.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 61 +---
 1 file changed, 16 insertions(+), 45 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c 
b/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
index 932b31fda6ad..9abe37bf318f 100644
--- a/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
+++ b/drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
@@ -53,21 +53,16 @@ u8 HalPwrSeqCmdParsing(
do {
PwrCfgCmd = PwrSeqCmd[AryIdx];
 
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   (
-   "HalPwrSeqCmdParsing: offset(%#x) cut_msk(%#x) 
fab_msk(%#x) interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
-   GET_PWR_CFG_OFFSET(PwrCfgCmd),
-   GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
-   GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
-   GET_PWR_CFG_INTF_MASK(PwrCfgCmd),
-   GET_PWR_CFG_BASE(PwrCfgCmd),
-   GET_PWR_CFG_CMD(PwrCfgCmd),
-   GET_PWR_CFG_MASK(PwrCfgCmd),
-   GET_PWR_CFG_VALUE(PwrCfgCmd)
-   )
-   );
+   pr_info("%s %s: offset(%#x) cut_msk(%#x) fab_msk(%#x) 
interface_msk(%#x) base(%#x) cmd(%#x) msk(%#x) value(%#x)\n",
+   DRIVER_PREFIX, __func__,
+   GET_PWR_CFG_OFFSET(PwrCfgCmd),
+   GET_PWR_CFG_CUT_MASK(PwrCfgCmd),
+   GET_PWR_CFG_FAB_MASK(PwrCfgCmd),
+   GET_PWR_CFG_INTF_MASK(PwrCfgCmd),
+   GET_PWR_CFG_BASE(PwrCfgCmd),
+   GET_PWR_CFG_CMD(PwrCfgCmd),
+   GET_PWR_CFG_MASK(PwrCfgCmd),
+   GET_PWR_CFG_VALUE(PwrCfgCmd));
 
/* 2 Only Handle the command whose FAB, CUT, and Interface are 
matched */
if (
@@ -77,19 +72,11 @@ u8 HalPwrSeqCmdParsing(
) {
switch (GET_PWR_CFG_CMD(PwrCfgCmd)) {
case PWR_CMD_READ:
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   ("HalPwrSeqCmdParsing: PWR_CMD_READ\n")
-   );
+   pr_info("%s %s: PWR_CMD_READ\n", DRIVER_PREFIX, 
__func__);
break;
 
case PWR_CMD_WRITE:
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   ("HalPwrSeqCmdParsing: PWR_CMD_WRITE\n")
-   );
+   pr_info("%s %s: PWR_CMD_WRITE\n", 
DRIVER_PREFIX, __func__);
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
 
/*  */
@@ -124,11 +111,7 @@ u8 HalPwrSeqCmdParsing(
break;
 
case PWR_CMD_POLLING:
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   ("HalPwrSeqCmdParsing: 
PWR_CMD_POLLING\n")
-   );
+   pr_info("%s %s: PWR_CMD_POLLING\n", 
DRIVER_PREFIX, __func__);
 
bPollingBit = false;
offset = GET_PWR_CFG_OFFSET(PwrCfgCmd);
@@ -160,11 +143,7 @@ u8 HalPwrSeqCmdParsing(
break;
 
case PWR_CMD_DELAY:
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   ("HalPwrSeqCmdParsing: PWR_CMD_DELAY\n")
-   );
+   pr_info("%s %s: PWR_CMD_DELAY\n", 
DRIVER_PREFIX, __func__);
if (GET_PWR_CFG_VALUE(PwrCfgCmd) == 
PWRSEQ_DELAY_US)
udelay(GET_PWR_CFG_OFFSET(PwrCfgCmd));
else
@@ -173,19 +152,11 @@ u8 HalPwrSeqCmdParsing(
 
case PWR_CMD_END:
/*  When this command is parsed, end the 
process */
-   RT_TRACE(
-   _module_hal_init_c_,
-   

[PATCH 14/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_sta_mgt.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 45 ++--
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c 
b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
index f96dd0b40e04..7febeff7308d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
@@ -216,10 +216,11 @@ structsta_info *rtw_alloc_stainfo(struct  
sta_priv *pstapriv, u8 *hwaddr)
 
index = wifi_mac_hash(hwaddr);
 
-   RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_, 
("rtw_alloc_stainfo: index  = %x", index));
+   pr_info("%s %s: index  = %x", DRIVER_PREFIX, __func__, index);
 
if (index >= NUM_STA) {
-   RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, ("ERROR 
=> rtw_alloc_stainfo: index >= NUM_STA"));
+   pr_err("%s ERROR => %s: index >= NUM_STA",
+  DRIVER_PREFIX, __func__);
spin_unlock_bh(&(pstapriv->sta_hash_lock));
psta = NULL;
goto exit;
@@ -242,16 +243,15 @@ structsta_info *rtw_alloc_stainfo(struct  
sta_priv *pstapriv, u8 *hwaddr)
for (i = 0; i < 16; i++)
memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i], 
&wRxSeqInitialValue, 2);
 
-   RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
-("alloc number_%d stainfo  with hwaddr = %x %x %x %x 
%x %x \n",
- pstapriv->asoc_sta_count,
- hwaddr[0],
- hwaddr[1],
- hwaddr[2],
- hwaddr[3],
- hwaddr[4],
- hwaddr[5])
-   );
+   pr_info("%s alloc number_%d stainfo  with hwaddr = %x %x %x %x 
%x %x\n",
+   DRIVER_PREFIX,
+   pstapriv->asoc_sta_count,
+   hwaddr[0],
+   hwaddr[1],
+   hwaddr[2],
+   hwaddr[3],
+   hwaddr[4],
+   hwaddr[5]);
 
init_addba_retry_timer(pstapriv->padapter, psta);
 
@@ -363,16 +363,15 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct 
sta_info *psta)
spin_unlock_bh(&pxmitpriv->lock);
 
list_del_init(&psta->hash_list);
-   RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_,
-("\n free number_%d stainfo  with hwaddr = 0x%.2x 0x%.2x 
0x%.2x 0x%.2x 0x%.2x 0x%.2x \n",
- pstapriv->asoc_sta_count,
- psta->hwaddr[0],
- psta->hwaddr[1],
- psta->hwaddr[2],
- psta->hwaddr[3],
- psta->hwaddr[4],
- psta->hwaddr[5])
-   );
+   pr_err("%s free number_%d stainfo  with hwaddr = 0x%.2x 0x%.2x 0x%.2x 
0x%.2x 0x%.2x 0x%.2x\n",
+  DRIVER_PREFIX,
+  pstapriv->asoc_sta_count,
+  psta->hwaddr[0],
+  psta->hwaddr[1],
+  psta->hwaddr[2],
+  psta->hwaddr[3],
+  psta->hwaddr[4],
+  psta->hwaddr[5]);
pstapriv->asoc_sta_count--;
 
/*  re-init sta_info; 20061114 will be init in alloc_stainfo */
@@ -543,7 +542,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter)
 
if (!psta) {
res = _FAIL;
-   RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, 
("rtw_alloc_stainfo fail"));
+   pr_err("%s rtw_alloc_stainfo fail", DRIVER_PREFIX);
goto exit;
}
 
-- 
2.20.1

[PATCH 13/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_wlan_util.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/core/rtw_wlan_util.c| 28 +--
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 760b0ea4e9bd..12566fbe1160 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1334,10 +1334,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 
*pframe, u32 packet_len)
memcpy(bssid->Ssid.Ssid, (p + 2), ssid_len);
bssid->Ssid.SsidLength = ssid_len;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s bssid.Ssid.Ssid:%s 
bssid.Ssid.SsidLength:%d "
-   "cur_network->network.Ssid.Ssid:%s len:%d\n", 
__func__, bssid->Ssid.Ssid,
-   bssid->Ssid.SsidLength, 
cur_network->network.Ssid.Ssid,
-   cur_network->network.Ssid.SsidLength));
+   pr_info("%s %s bssid.Ssid.Ssid:%s bssid.Ssid.SsidLength:%d "
+   "cur_network->network.Ssid.Ssid:%s len:%d\n",
+   DRIVER_PREFIX, __func__, bssid->Ssid.Ssid,
+   bssid->Ssid.SsidLength, cur_network->network.Ssid.Ssid,
+   cur_network->network.Ssid.SsidLength);
 
if (memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) ||
bssid->Ssid.SsidLength != 
cur_network->network.Ssid.SsidLength) {
@@ -1355,9 +1356,8 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 
*pframe, u32 packet_len)
else
bssid->Privacy = 0;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
-   ("%s(): cur_network->network.Privacy is %d, 
bssid.Privacy is %d\n",
-__func__, cur_network->network.Privacy, 
bssid->Privacy));
+   pr_info("%s %s(): cur_network->network.Privacy is %d, bssid.Privacy is 
%d\n",
+   DRIVER_PREFIX, __func__, cur_network->network.Privacy, 
bssid->Privacy);
if (cur_network->network.Privacy != bssid->Privacy) {
DBG_871X("%s(), privacy is not match\n", __func__);
goto _mismatch;
@@ -1383,24 +1383,22 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 
*pframe, u32 packet_len)
pbuf = rtw_get_wpa_ie(&bssid->IEs[12], &wpa_ielen, 
bssid->IELength-12);
if (pbuf && (wpa_ielen > 0)) {
if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, 
&group_cipher, &pairwise_cipher, &is_8021x)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
-   ("%s pnetwork->pairwise_cipher: 
%d, group_cipher is %d, is_8021x is %d\n", __func__,
-pairwise_cipher, group_cipher, 
is_8021x));
+   pr_info("%s %s pnetwork->pairwise_cipher: %d, 
group_cipher is %d, is_8021x is %d\n",
+   DRIVER_PREFIX, __func__, 
pairwise_cipher, group_cipher, is_8021x);
}
} else {
pbuf = rtw_get_wpa2_ie(&bssid->IEs[12], &wpa_ielen, 
bssid->IELength-12);
 
if (pbuf && (wpa_ielen > 0)) {
if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, 
wpa_ielen+2, &group_cipher, &pairwise_cipher, &is_8021x)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, 
_drv_info_,
-   ("%s 
pnetwork->pairwise_cipher: %d, pnetwork->group_cipher is %d, is_802x is %d\n",
-__func__, 
pairwise_cipher, group_cipher, is_8021x));
+   pr_info("%s %s 
pnetwork->pairwise_cipher: %d, pnetwork->group_cipher is %d, is_802x is %d\n",
+   DRIVER_PREFIX, __func__, 
pairwise_cipher, group_cipher, is_8021x);
}
}
}
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
-   ("%s cur_network->group_cipher is %d: %d\n", 
__func__, cur_network->BcnInfo.group_cipher, group_cipher));
+   pr_err("%s %s cur_network->group_cipher is %d: %d\n",
+  DRIVER_PREFIX, __func__, 
cur_network->BcnInfo.group_cipher, group_cipher);
if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || 
group_cipher != cur_network->BcnInfo.group_cipher) {
DBG_871X("%s pairwise_cipher(%x:%x) or 
group_cipher(%x:%x) is not match\n", __func__,
pairwise_cipher, 
cur_network->BcnInfo.pairwise_cipher,
-- 
2.20.1

[PATCH 07/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_mlme.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 122 +-
 1 file changed, 72 insertions(+), 50 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 4289bf40aa73..5e070ba6fb92 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -155,8 +155,7 @@ struct  wlan_network *rtw_alloc_network(struct  
mlme_priv *pmlmepriv)
 
list_del_init(&pnetwork->list);
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
-("rtw_alloc_network: ptr =%p\n", plist));
+   pr_info("%s %s: ptr =%p\n", DRIVER_PREFIX, __func__, plist);
pnetwork->network_type = 0;
pnetwork->fixed = false;
pnetwork->last_scanned = jiffies;
@@ -299,7 +298,9 @@ signed int rtw_if_up(struct adapter *padapter)
 
if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||
(check_fwstate(&padapter->mlmepriv, _FW_LINKED) == false)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)", 
padapter->bDriverStopped, padapter->bSurpriseRemoved));
+   pr_info("%s %s:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+   DRIVER_PREFIX, __func__, padapter->bDriverStopped,
+   padapter->bSurpriseRemoved);
res = false;
} else
res =  true;
@@ -339,7 +340,7 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
 
 void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
 {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n"));
+   pr_err("%s %s\n", DRIVER_PREFIX, __func__);
_rtw_free_mlme_priv(pmlmepriv);
 }
 
@@ -608,7 +609,7 @@ void rtw_update_scanned_network(struct adapter *adapter, 
struct wlan_bssid_ex *t
/* list_del_init(&oldest->list); */
pnetwork = oldest;
if (!pnetwork) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 
("\n\n\nsomething wrong here\n\n\n"));
+   pr_err("%s something wrong here\n", 
DRIVER_PREFIX);
goto exit;
}
memcpy(&(pnetwork->network), target,  
get_wlan_bssid_ex_sz(target));
@@ -629,7 +630,7 @@ void rtw_update_scanned_network(struct adapter *adapter, 
struct wlan_bssid_ex *t
pnetwork = rtw_alloc_network(pmlmepriv); /*  will 
update scan_time */
 
if (!pnetwork) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, 
("\n\n\nsomething wrong here\n\n\n"));
+   pr_err("%s something wrong here\n", 
DRIVER_PREFIX);
goto exit;
}
 
@@ -750,7 +751,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct 
wlan_network *pnetwor
 /* TODO: Perry : For Power Management */
 void rtw_atimdone_event_callback(struct adapter*adapter, u8 *pbuf)
 {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("receive 
atimdone_event\n"));
+   pr_err("%s receive atimdone_event\n", DRIVER_PREFIX);
 }
 
 void rtw_survey_event_callback(struct adapter  *adapter, u8 *pbuf)
@@ -761,11 +762,11 @@ void rtw_survey_event_callback(struct adapter 
*adapter, u8 *pbuf)
 
pnetwork = (struct wlan_bssid_ex *)pbuf;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("rtw_survey_event_callback, ssid =%s\n",  pnetwork->Ssid.Ssid));
+   pr_info("%s %s, ssid =%s\n", DRIVER_PREFIX, __func__, 
pnetwork->Ssid.Ssid);
 
len = get_wlan_bssid_ex_sz(pnetwork);
if (len > (sizeof(struct wlan_bssid_ex))) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("\n 
rtw_survey_event_callback: return a wrong bss ***\n"));
+   pr_err("%s %s: return a wrong bss ***\n", DRIVER_PREFIX, 
__func__);
return;
}
 
@@ -811,14 +812,15 @@ void rtw_surveydone_event_callback(struct adapter 
*adapter, u8 *pbuf)
pmlmepriv->wps_probe_req_ie = NULL;
}
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("rtw_surveydone_event_callback: fw_state:%x\n\n", get_fwstate(pmlmepriv)));
+   pr_info("%s %s: fw_state:%x\n\n", DRIVER_PREFIX, __func__, 
get_fwstate(pmlmepriv));
 
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
del_timer_sync(&pmlmepriv->scan_to_timer);
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
} else {
 
-  

[PATCH 10/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_recv.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c | 240 ++
 1 file changed, 157 insertions(+), 83 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 189f686a1f29..5b5fca291b99 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -325,9 +325,16 @@ static signed int recvframe_chkmic(struct adapter 
*adapter,  union recv_frame *p
stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]);
 
if (prxattrib->encrypt == _TKIP_) {
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n 
recvframe_chkmic:prxattrib->encrypt == _TKIP_\n"));
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n 
recvframe_chkmic:da = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
-   prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2], 
prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));
+   pr_info("%s %s:prxattrib->encrypt == _TKIP_\n", DRIVER_PREFIX,
+   __func__);
+   pr_info("%s %s:da = 
0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+   DRIVER_PREFIX, __func__,
+   prxattrib->ra[0],
+   prxattrib->ra[1],
+   prxattrib->ra[2],
+   prxattrib->ra[3],
+   prxattrib->ra[4],
+   prxattrib->ra[5]);
 
/* calculate mic code */
if (stainfo) {
@@ -337,26 +344,28 @@ static signed int recvframe_chkmic(struct adapter 
*adapter,  union recv_frame *p
/* rxdata_key_idx =(((iv[3])>>6)&0x3) ; */
mickey = 
&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
 
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, 
("\n recvframe_chkmic: bcmc key\n"));
+   pr_info("%s %s: bcmc key\n", DRIVER_PREFIX, 
__func__);
/* DBG_871X("\n recvframe_chkmic: bcmc key 
psecuritypriv->dot118021XGrpKeyid(%d), pmlmeinfo->key_index(%d) , recv 
key_id(%d)\n", */
/* psecuritypriv->dot118021XGrpKeyid, 
pmlmeinfo->key_index, rxdata_key_idx); */
 
if (psecuritypriv->binstallGrpkey == false) {
res = _FAIL;
-   RT_TRACE(_module_rtl871x_recv_c_, 
_drv_err_, ("\n recvframe_chkmic:didn't install group key!!\n"));
+   pr_err("%s %s:didn't install group 
key!!\n",
+  DRIVER_PREFIX, __func__);
DBG_871X("\n recvframe_chkmic:didn't 
install group key!!\n");
goto exit;
}
} else {
mickey = &stainfo->dot11tkiprxmickey.skey[0];
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, 
("\n recvframe_chkmic: unicast key\n"));
+   pr_err("%s %s: unicast key\n", DRIVER_PREFIX, 
__func__);
}
 
datalen = 
precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;/*
 icv_len included the mic code */
pframe = precvframe->u.hdr.rx_data;
payload = pframe+prxattrib->hdrlen+prxattrib->iv_len;
 
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n 
prxattrib->iv_len =%d prxattrib->icv_len =%d\n", prxattrib->iv_len, 
prxattrib->icv_len));
+   pr_info("%s prxattrib->iv_len =%d prxattrib->icv_len 
=%d\n",
+   DRIVER_PREFIX, prxattrib->iv_len, 
prxattrib->icv_len);
 
 
rtw_seccalctkipmic(mickey, pframe, payload, datalen, 
&miccode[0], (unsigned char)prxattrib->priority); /* care the length of the 
data */
@@ -367,7 +376,9 @@ static signed int recvframe_chkmic(struct adapter *adapter, 
 union recv_frame *p
 
for (i = 0; i < 8; i++) {
if (miccode[i] != *(pframemic+i)) {
-   RT_TRACE(_module_rtl871x_recv_c_, 
_drv_err_, ("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) ", i, 
miccode[i], i, *(pframe

[PATCH 05/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_cmd.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_cmd.c | 55 +---
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c 
b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 2aaf25b48f96..63b5351d9f63 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -221,7 +221,7 @@ int rtw_init_evt_priv(struct evt_priv *pevtpriv)
 
 void _rtw_free_evt_priv(struct evt_priv *pevtpriv)
 {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+_rtw_free_evt_priv\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
_cancel_workitem_sync(&pevtpriv->c2h_wk);
while (pevtpriv->c2h_wk_alive)
@@ -234,7 +234,7 @@ void _rtw_free_evt_priv(struct  evt_priv *pevtpriv)
}
kfree(pevtpriv->c2h_queue);
 
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-_rtw_free_evt_priv\n"));
+   pr_info("%s-%s\n", DRIVER_PREFIX, __func__);
 }
 
 void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
@@ -299,13 +299,13 @@ structcmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
 
 void rtw_free_evt_priv(struct  evt_priv *pevtpriv)
 {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n"));
+   pr_info("%s %s\n", DRIVER_PREFIX, __func__);
_rtw_free_evt_priv(pevtpriv);
 }
 
 void rtw_free_cmd_priv(struct  cmd_priv *pcmdpriv)
 {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n"));
+   pr_info("%s %s\n", DRIVER_PREFIX, __func__);
_rtw_free_cmd_priv(pcmdpriv);
 }
 
@@ -415,7 +415,7 @@ int rtw_cmd_thread(void *context)
atomic_set(&(pcmdpriv->cmdthd_running), true);
complete(&pcmdpriv->terminate_cmdthread_comp);
 
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x 
rtw_cmd_thread \n"));
+   pr_info("%s start r871x %s \n", DRIVER_PREFIX, __func__);
 
while (1) {
if 
(wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) {
@@ -440,8 +440,7 @@ int rtw_cmd_thread(void *context)
}
 
if (rtw_register_cmd_alive(padapter) != _SUCCESS) {
-   RT_TRACE(_module_hal_xmit_c_, _drv_notice_,
-("%s: wait to leave LPS_LCLK\n", 
__func__));
+   pr_notice("%s %s: wait to leave LPS_LCLK\n", 
DRIVER_PREFIX, __func__);
continue;
}
 
@@ -512,14 +511,16 @@ int rtw_cmd_thread(void *context)
if (pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) {
pcmd_callback = 
rtw_cmd_callback[pcmd->cmdcode].callback;
if (pcmd_callback == NULL) {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, 
("mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n", pcmd_callback, 
pcmd->cmdcode));
+   pr_info("%s mlme_cmd_hdl(): pcmd_callback = 
0x%p, cmdcode = 0x%x\n",
+   DRIVER_PREFIX, pcmd_callback, 
pcmd->cmdcode);
rtw_free_cmd_obj(pcmd);
} else {
/* todo: !!! fill rsp_buf to pcmd->rsp if 
(pcmd->rsp!= NULL) */
pcmd_callback(pcmd->padapter, pcmd);/* need 
consider that free cmd_obj in rtw_cmd_callback */
}
} else {
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("%s: 
cmdcode = 0x%x callback not defined!\n", __func__, pcmd->cmdcode));
+   pr_err("%s %s: cmdcode = 0x%x callback not defined!\n",
+  DRIVER_PREFIX, __func__, pcmd->cmdcode);
rtw_free_cmd_obj(pcmd);
}
 
@@ -583,7 +584,7 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct 
ndis_802_11_ssid *ssid,
 
rtw_free_network_queue(padapter, false);
 
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network 
queue\n", __func__));
+   pr_info("%s %s: flush network queue\n", DRIVER_PREFIX, __func__);
 
init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, 
GEN_CMD_CODE(_SiteSurvey));
 
@@ -677,9 +678,11 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
u8 res = _SUCCESS;
 
if (pmlmepriv->assoc_ssid.SsidLength == 0)
-   RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for 
Any SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
+   pr_info("%s createbss for Any SSid:%s\n",
+   DRIVER_PREFIX, pmlmepriv->assoc_ssid.Ssid

[PATCH 11/40] staging: rtl8723bs: remove commented RT_TRACE call in core/rtw_ioctl_set.c

[Fabio Aiuto]

remove commented RT_TRACE call in core/rtw_ioctl_set.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 7d858cae2395..14eb01df69b0 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -451,9 +451,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter 
*padapter,
 
/* SecClearAllKeys(adapter); */
 
-   /* RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: 
fw_state:%x after changing mode\n", */
-   /*  
get_fwstate(pmlmepriv))); */
-
spin_unlock_bh(&pmlmepriv->lock);
}
return true;
-- 
2.20.1

[PATCH 15/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_ieee80211.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/core/rtw_ieee80211.c| 116 +++---
 1 file changed, 74 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c 
b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index e931afc3ba22..a7589f919c35 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -489,7 +489,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int 
*group_cipher, int *pairwis
left -= WPA_SELECTOR_LEN;
 
} else if (left > 0) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie length 
mismatch, %u too much", __func__, left));
+   pr_err("%s %s: ie length mismatch, %u too much",
+  DRIVER_PREFIX, __func__, left);
 
return _FAIL;
}
@@ -502,8 +503,9 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int 
*group_cipher, int *pairwis
left -= 2;
 
if (count == 0 || left < count * WPA_SELECTOR_LEN) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie 
count botch (pairwise), "
-   "count %u left %u", __func__, 
count, left));
+   pr_err("%s %s: ie count botch (pairwise), "
+  "count %u left %u", DRIVER_PREFIX,
+  __func__, count, left);
return _FAIL;
}
 
@@ -515,7 +517,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int 
*group_cipher, int *pairwis
}
 
} else if (left == 1) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie too short 
(for key mgmt)",   __func__));
+   pr_err("%s %s: ie too short (for key mgmt)", DRIVER_PREFIX, 
__func__);
return _FAIL;
}
 
@@ -523,7 +525,8 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int 
*group_cipher, int *pairwis
if (left >= 6) {
pos += 2;
if (!memcmp(pos, SUITE_1X, 4)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("%s : there has 802.1x auth\n", __func__));
+   pr_info("%s %s : there has 802.1x auth\n",
+   DRIVER_PREFIX, __func__);
*is_8021x = 1;
}
}
@@ -560,7 +563,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int 
*group_cipher, int *pairwi
left -= RSN_SELECTOR_LEN;
 
} else if (left > 0) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie length 
mismatch, %u too much", __func__, left));
+   pr_err("%s %s: ie length mismatch, %u too much",
+  DRIVER_PREFIX, __func__, left);
return _FAIL;
}
 
@@ -572,8 +576,9 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int 
*group_cipher, int *pairwi
left -= 2;
 
if (count == 0 || left < count * RSN_SELECTOR_LEN) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie 
count botch (pairwise), "
-"count %u left %u", __func__, 
count, left));
+   pr_err("%s %s: ie count botch (pairwise), "
+  "count %u left %u",
+  DRIVER_PREFIX, __func__, count, left);
return _FAIL;
}
 
@@ -585,7 +590,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int 
*group_cipher, int *pairwi
}
 
} else if (left == 1) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("%s: ie too short 
(for key mgmt)",  __func__));
+   pr_err("%s %s: ie too short (for key mgmt)",
+  DRIVER_PREFIX, __func__);
 
return _FAIL;
}
@@ -594,7 +600,8 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int 
*group_cipher, int *pairwi
if (left >= 6) {
pos += 2;
if (!memcmp(pos, SUITE_1X, 4)) {
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("%s (): there has 802.1x auth\n", __func__));
+   pr_info("%s %s: there has 802.1x auth\n",
+   DRIVER_PREFIX, __func__);
*is_8021x = 1;
}
}
@@ -630,9 +637,16 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, 
u1

[PATCH 17/40] staging: rtl8723bs: fix constant name in hal/rtl8723b_hal_init.c

[Fabio Aiuto]

fix constant name in log message call

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 0273118e70af..0f7da8dbd80c 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -412,7 +412,7 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, 
bool  bUsedWoWLANFw)
RT_TRACE(
_module_hal_init_c_,
_drv_err_,
-   ("Firmware size exceed 0x%X. Check it.\n", 
FW_8188E_SIZE)
+   ("Firmware size exceed 0x%X. Check it.\n", 
FW_8723B_SIZE)
);
goto exit;
}
-- 
2.20.1

[PATCH 18/40] staging: rtl8723bs: added driver prefix in log messages

[Fabio Aiuto]

added driver prefix in log messages in hal/rtl8723b_hal_init.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 0f7da8dbd80c..7b92bc5ed1c7 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -396,13 +396,14 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, 
bool  bUsedWoWLANFw)
 
rtStatus = request_firmware(&fw, fwfilepath, device);
if (rtStatus) {
-   pr_err("Request firmware failed with error 0x%x\n", rtStatus);
+   pr_err("%s Request firmware failed with error 0x%x\n",
+  DRIVER_PREFIX, rtStatus);
rtStatus = _FAIL;
goto exit;
}
 
if (!fw) {
-   pr_err("Firmware %s not available\n", fwfilepath);
+   pr_err("%s Firmware %s not available\n", DRIVER_PREFIX, 
fwfilepath);
rtStatus = _FAIL;
goto exit;
}
-- 
2.20.1

[PATCH 20/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723b_hal_init.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 143 +-
 1 file changed, 68 insertions(+), 75 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index e9d107093942..fa904061a9c3 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -65,17 +65,12 @@ static int _BlockWrite(struct adapter *padapter, void 
*buffer, u32 buffSize)
remainSize_p1 = buffSize % blockSize_p1;
 
if (blockCount_p1) {
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_notice_,
-   (
-   "_BlockWrite: [P1] buffSize(%d) 
blockSize_p1(%d) blockCount_p1(%d) remainSize_p1(%d)\n",
-   buffSize,
-   blockSize_p1,
-   blockCount_p1,
-   remainSize_p1
-   )
-   );
+   pr_notice("%s %s: [P1] buffSize(%d) blockSize_p1(%d) 
blockCount_p1(%d) remainSize_p1(%d)\n",
+ DRIVER_PREFIX, __func__,
+ buffSize,
+ blockSize_p1,
+ blockCount_p1,
+ remainSize_p1);
}
 
for (i = 0; i < blockCount_p1; i++) {
@@ -94,17 +89,12 @@ static int _BlockWrite(struct adapter *padapter, void 
*buffer, u32 buffSize)
remainSize_p2 = remainSize_p1%blockSize_p2;
 
if (blockCount_p2) {
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_notice_,
-   (
-   "_BlockWrite: [P2] 
buffSize_p2(%d) blockSize_p2(%d) blockCount_p2(%d) remainSize_p2(%d)\n",
-   (buffSize-offset),
-   blockSize_p2,
-   blockCount_p2,
-   remainSize_p2
-   )
-   );
+   pr_notice("%s %s: [P2] buffSize_p2(%d) blockSize_p2(%d) 
blockCount_p2(%d) remainSize_p2(%d)\n",
+ DRIVER_PREFIX, __func__,
+ (buffSize-offset),
+ blockSize_p2,
+ blockCount_p2,
+ remainSize_p2);
}
 
}
@@ -115,9 +105,9 @@ static int _BlockWrite(struct adapter *padapter, void 
*buffer, u32 buffSize)
 
blockCount_p3 = remainSize_p2 / blockSize_p3;
 
-   RT_TRACE(_module_hal_init_c_, _drv_notice_,
-   ("_BlockWrite: [P3] buffSize_p3(%d) 
blockSize_p3(%d) blockCount_p3(%d)\n",
-   (buffSize-offset), blockSize_p3, 
blockCount_p3));
+   pr_notice("%s %s: [P3] buffSize_p3(%d) blockSize_p3(%d) 
blockCount_p3(%d)\n",
+ DRIVER_PREFIX, __func__, (buffSize-offset), 
blockSize_p3,
+ blockCount_p3);
 
for (i = 0; i < blockCount_p3; i++) {
ret = rtw_write8(padapter, (FW_8723B_START_ADDRESS + 
offset + i), *(bufferPtr + offset + i));
@@ -181,7 +171,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, 
u32 size)
goto exit;
}
}
-   RT_TRACE(_module_hal_init_c_, _drv_info_, ("_WriteFW Done- for Normal 
chip.\n"));
+   pr_info("%s %s Done- for Normal chip.\n", DRIVER_PREFIX, __func__);
 
 exit:
return ret;
@@ -334,10 +324,10 @@ void rtl8723b_FirmwareSelfReset(struct adapter *padapter)
udelay(50);
u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
}
-   RT_TRACE(_module_hal_init_c_, _drv_notice_, ("-%s: 8051 reset 
success (%d)\n", __func__, Delay));
+   pr_notice("%s-%s: 8051 reset success (%d)\n", DRIVER_PREFIX, 
__func__, Delay);
 
if (Delay == 0) {
-   RT_TRACE(_module_hal_init_c_, _drv_notice_, ("%s: Force 
8051 reset!!!\n", __func__));
+   pr_notice("%s %s: Force 8051 reset!!!\n", 
DRIVER_PREFIX, __func__);
/* force firmware reset */
u1bTmp = rtw_read8(padapter, REG_SYS_FUNC_EN+1);
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp&(~BIT2));
@@ -368,7 +358

[PATCH 19/40] staging: rtl8723bs: remove commented RT_TRACE call in hal/rtl8723b_hal_init.c

[Fabio Aiuto]

remove commented RT_TRACE call in hal/rtl8723b_hal_init.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 7b92bc5ed1c7..e9d107093942 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2656,7 +2656,6 @@ void Hal_EfuseParseEEPROMVer_8723B(
 {
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-/* RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("%s(): AutoLoadFail = 
%d\n", __func__, AutoLoadFail)); */
if (!AutoLoadFail)
pHalData->EEPROMVersion = hwinfo[EEPROM_VERSION_8723B];
else
@@ -2739,7 +2738,6 @@ void Hal_EfuseParseCustomerID_8723B(
 {
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-/* RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("%s(): AutoLoadFail = 
%d\n", __func__, AutoLoadFail)); */
if (!AutoLoadFail)
pHalData->EEPROMCustomerID = hwinfo[EEPROM_CustomID_8723B];
else
@@ -2762,7 +2760,6 @@ void Hal_EfuseParseXtal_8723B(
 {
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-/* RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("%s(): AutoLoadFail = 
%d\n", __func__, AutoLoadFail)); */
if (!AutoLoadFail) {
pHalData->CrystalCap = hwinfo[EEPROM_XTAL_8723B];
if (pHalData->CrystalCap == 0xFF)
@@ -2780,7 +2777,6 @@ void Hal_EfuseParseThermalMeter_8723B(
 {
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-/* RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, ("%s(): AutoLoadFail = 
%d\n", __func__, AutoLoadFail)); */
/*  */
/*  ThermalMeter from EEPROM */
/*  */
@@ -3084,7 +3080,6 @@ static void rtl8723b_fill_default_txdesc(
 
ptxdesc->usb_txagg_num = pxmitframe->agg_num;
} else if (pxmitframe->frame_tag == MGNT_FRAMETAG) {
-/* RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: 
MGNT_FRAMETAG\n", __func__)); */
 
ptxdesc->macid = pattrib->mac_id; /*  CAM_ID(MAC_ID) */
ptxdesc->qsel = pattrib->qsel;
@@ -3868,9 +3863,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, 
u8 *val)
ulCommand = ulCommand | CAM_POLLINIG | 
CAM_WRITE;
/*  write content 0 is equall to mark invalid */
rtw_write32(padapter, WCAMI, ulContent);  /* 
mdelay(40); */
-   /* RT_TRACE(COMP_SEC, DBG_LOUD, 
("CAM_empty_entry(): WRITE A4: %lx\n", ulContent)); */
rtw_write32(padapter, RWCAM, ulCommand);  /* 
mdelay(40); */
-   /* RT_TRACE(COMP_SEC, DBG_LOUD, 
("CAM_empty_entry(): WRITE A0: %lx\n", ulCommand)); */
}
}
break;
-- 
2.20.1

[PATCH 22/40] staging: rtl8723bs: remove commented code block in hal/hal_com_phycfg.c

[Fabio Aiuto]

remove commented 5G code block in hal/hal_com_phycfg.c

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/hal/hal_com_phycfg.c| 20 ---
 1 file changed, 20 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c 
b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 9b16265b543d..a7ecdf501a14 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -1780,26 +1780,6 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 
reg_pwr_tbl_sel,
DBG_871X("No power limit table of the specified band\n");
}
 
-   /*  combine 5G VHT & HT rate */
-   /*  5G 20M and 40M HT and VHT can cross reference */
-   /*
-   if (band_type == BAND_ON_5G && pwr_lmt == MAX_POWER_INDEX) {
-   if (idx_bandwidth == 0 || idx_bandwidth == 1) {
-   RT_TRACE(COMP_INIT, DBG_LOUD, ("No power limit table of 
the specified band %d, bandwidth %d, ratesection %d, rf path %d\n",
-idx_band, idx_bandwidth,
-idx_rate_sctn, rf_path));
-   if (idx_rate_sctn == 2)
-   pwr_lmt = 
hal_data->TxPwrLimit_5G[idx_regulation][idx_bandwidth][4][idx_channel][rf_path];
-   else if (idx_rate_sctn == 4)
-   pwr_lmt = 
hal_data->TxPwrLimit_5G[idx_regulation][idx_bandwidth][2][idx_channel][rf_path];
-   else if (idx_rate_sctn == 3)
-   pwr_lmt = 
hal_data->TxPwrLimit_5G[idx_regulation][idx_bandwidth][5][idx_channel][rf_path];
-   else if (idx_rate_sctn == 5)
-   pwr_lmt = 
hal_data->TxPwrLimit_5G[idx_regulation][idx_bandwidth][3][idx_channel][rf_path];
-   }
-   }
-   */
-
/* DBG_871X("TxPwrLmt[Regulation %d][Band %d][BW %d][RFPath %d][Rate 
0x%x][Chnl %d] = %d\n", */
/*  idx_regulation, hal_data->CurrentBandType, bandwidth, 
rf_path, data_rate, channel, pwr_lmt); */
return pwr_lmt;
-- 
2.20.1

[PATCH 23/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723b_phycfg.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   | 48 +--
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 2abff4673be2..59a659b76995 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -551,7 +551,7 @@ void PHY_SetTxPowerIndex(
break;
}
} else {
-   RT_TRACE(_module_hal_init_c_, _drv_err_, ("Invalid 
RFPath!!\n"));
+   pr_err("%s Invalid RFPath!!\n", DRIVER_PREFIX);
}
 }
 
@@ -604,11 +604,11 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 
Channel)
RFPath = pHalData->ant_path;
}
 
-   RT_TRACE(_module_hal_init_c_, _drv_info_, 
("==>PHY_SetTxPowerLevel8723B()\n"));
+   pr_info("%s ==> %s\n", DRIVER_PREFIX, __func__);
 
PHY_SetTxPowerLevelByPath(Adapter, Channel, RFPath);
 
-   RT_TRACE(_module_hal_init_c_, _drv_info_, 
("<==PHY_SetTxPowerLevel8723B()\n"));
+   pr_info("%s <== %s\n", DRIVER_PREFIX, __func__);
 }
 
 void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel)
@@ -648,23 +648,20 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter 
*Adapter)
u8 SCSettingOf40 = 0, SCSettingOf20 = 0;
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
 
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   (
-   "SCMapping: VHT Case: pHalData->CurrentChannelBW %d, 
pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n",
-   pHalData->CurrentChannelBW,
-   pHalData->nCur80MhzPrimeSC,
-   pHalData->nCur40MhzPrimeSC
-   )
-   );
+   pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, "
+   "pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC 
%d\n",
+   DRIVER_PREFIX,
+   pHalData->CurrentChannelBW,
+   pHalData->nCur80MhzPrimeSC,
+   pHalData->nCur40MhzPrimeSC);
+
if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
SCSettingOf40 = VHT_DATA_SC_40_LOWER_OF_80MHZ;
else if (pHalData->nCur80MhzPrimeSC == 
HAL_PRIME_CHNL_OFFSET_UPPER)
SCSettingOf40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;
else
-   RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: 
Not Correct Primary40MHz Setting\n"));
+   pr_err("%s SCMapping: Not Correct Primary40MHz 
Setting\n", DRIVER_PREFIX);
 
if (
(pHalData->nCur40MhzPrimeSC == 
HAL_PRIME_CHNL_OFFSET_LOWER) &&
@@ -687,27 +684,26 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter 
*Adapter)
)
SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;
else
-   RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: 
Not Correct Primary40MHz Setting\n"));
+   pr_err("%s SCMapping: Not Correct Primary40MHz 
Setting\n",
+  DRIVER_PREFIX);
} else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
-   RT_TRACE(
-   _module_hal_init_c_,
-   _drv_info_,
-   (
-   "SCMapping: VHT Case: 
pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d\n",
-   pHalData->CurrentChannelBW,
-   pHalData->nCur40MhzPrimeSC
-   )
-   );
+   pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, 
"
+   "pHalData->nCur40MhzPrimeSC %d\n",
+   DRIVER_PREFIX, pHalData->CurrentChannelBW,
+   pHalData->nCur40MhzPrimeSC);
 
if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
else if (pHalData->nCur40MhzPrimeSC == 
HAL_PRIME_CHNL_OFFSET_LOWER)
SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
else
-   RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: 
Not Correct Primary40MHz Setting\n"));
+   pr_err(&quo

[PATCH 27/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723bs_recv.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c 
b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
index 17a3e7bf66ef..7c8e0402f150 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
@@ -346,7 +346,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t)

update_recvframe_phyinfo(precvframe, (struct phy_stat *)ptr);
 
if (rtw_recv_entry(precvframe) != 
_SUCCESS) {
-   
RT_TRACE(_module_rtl871x_recv_c_, _drv_dump_, ("%s: rtw_recv_entry(precvframe) 
!= _SUCCESS\n", __func__));
+   pr_devel("%s %s: 
rtw_recv_entry(precvframe) != _SUCCESS\n",
+DRIVER_PREFIX, 
__func__);
}
} else if (pattrib->pkt_rpt_type == C2H_PACKET) 
{
struct c2h_evt_hdr_tC2hEvent;
@@ -404,7 +405,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter)
precvpriv->pallocated_recv_buf = rtw_zmalloc(n);
if (!precvpriv->pallocated_recv_buf) {
res = _FAIL;
-   RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("alloc recv_buf 
fail!\n"));
+   pr_err("%s alloc recv_buf fail!\n", DRIVER_PREFIX);
goto exit;
}
 
-- 
2.20.1

[PATCH 26/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/sdio_halinit.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/sdio_halinit.c | 49 ++--
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c 
b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index b1c4bbf29790..281713b4d5c9 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -57,11 +57,7 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)
/*  only cmd52 can be used before power on(card enable) */
ret = CardEnable(padapter);
if (!ret) {
-   RT_TRACE(
-   _module_hci_hal_init_c_,
-   _drv_emerg_,
-   ("%s: run power on flow fail\n", __func__)
-   );
+   pr_emerg("%s %s: run power on flow fail\n", DRIVER_PREFIX, 
__func__);
return _FAIL;
}
 
@@ -680,7 +676,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
ret = _InitPowerOn_8723BS(padapter);
if (_FAIL == ret) {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("Failed to init 
Power On!\n"));
+   pr_err("%s Failed to init Power On!\n", DRIVER_PREFIX);
return _FAIL;
}
 
@@ -688,12 +684,13 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
ret = rtl8723b_FirmwareDownload(padapter, false);
if (ret != _SUCCESS) {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("%s: Download 
Firmware failed!!\n", __func__));
+   pr_err("%s %s: Download Firmware failed!!\n", DRIVER_PREFIX, 
__func__);
padapter->bFWReady = false;
pHalData->fw_ractrl = false;
return ret;
} else {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_notice_, 
("rtl8723bs_hal_init(): Download Firmware Success!!\n"));
+   pr_notice("%s %s: Download Firmware Success!!\n",
+ DRIVER_PREFIX, __func__);
padapter->bFWReady = true;
pHalData->fw_ractrl = true;
}
@@ -719,7 +716,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 #if (HAL_MAC_ENABLE == 1)
ret = PHY_MACConfig8723B(padapter);
if (ret != _SUCCESS) {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 
("Initializepadapter8192CSdio(): Fail to configure MAC!!\n"));
+   pr_info("%s Initializepadapter8192CSdio(): Fail to configure 
MAC!!\n",
+   DRIVER_PREFIX);
return ret;
}
 #endif
@@ -729,7 +727,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 #if (HAL_BB_ENABLE == 1)
ret = PHY_BBConfig8723B(padapter);
if (ret != _SUCCESS) {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 
("Initializepadapter8192CSdio(): Fail to configure BB!!\n"));
+   pr_info("%s Initializepadapter8192CSdio(): Fail to configure 
BB!!\n",
+   DRIVER_PREFIX);
return ret;
}
 #endif
@@ -741,7 +740,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 #if (HAL_RF_ENABLE == 1)
ret = PHY_RFConfig8723B(padapter);
if (ret != _SUCCESS) {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 
("Initializepadapter8192CSdio(): Fail to configure RF!!\n"));
+   pr_info("%s Initializepadapter8192CSdio(): Fail to 
configure RF!!\n",
+   DRIVER_PREFIX);
return ret;
}
 #endif
@@ -893,7 +893,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
/*  Init BT hw config. */
hal_btcoex_InitHwConfig(padapter, false);
 
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("-%s\n", __func__));
+   pr_info("%s-%s\n", DRIVER_PREFIX, __func__);
 
return _SUCCESS;
 }
@@ -1030,9 +1030,9 @@ static u32 rtl8723bs_inirp_init(struct adapter *padapter)
 
 static u32 rtl8723bs_inirp_deinit(struct adapter *padapter)
 {
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 
("+rtl8723bs_inirp_deinit\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
-   RT_TRACE(_module_hci_hal_init_c_, _drv_info_, 
("-rtl8723bs_inirp_deinit\n"));
+   pr_info("%s-%s\n", DRIVER_PREFIX, __func__);
 
return _SUCCESS;
 }
@@ -1132,8 +1132,8 @@ static void Hal_EfuseParseMACAddr_8723BS(
}
 /* NicIFSetMacAddress(padapter, padapter->PermanentAddress); */
 
-   RT_TRACE(_module_hci_hal_init_c_, _drv_notice_,
-("Hal_EfuseParseMACAddr_8723BS: Permanent Address = %pM\n", 
pEEPROM->mac_addr));
+  

[PATCH 21/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/sdio_ops.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/sdio_ops.c | 42 
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c 
b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index a24a39e70454..34531d6a6810 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -777,29 +777,15 @@ void EnableInterrupt8723BSdio(struct adapter *adapter)
himr = cpu_to_le32(haldata->sdio_himr);
sdio_local_write(adapter, SDIO_REG_HIMR, 4, (u8 *)&himr);
 
-   RT_TRACE(
-   _module_hci_ops_c_,
-   _drv_notice_,
-   (
-   "%s: enable SDIO HIMR = 0x%08X\n",
-   __func__,
-   haldata->sdio_himr
-   )
-   );
+   pr_notice("%s %s: enable SDIO HIMR = 0x%08X\n",
+ DRIVER_PREFIX, __func__, haldata->sdio_himr);
 
/*  Update current system IMR settings */
tmp = rtw_read32(adapter, REG_HSIMR);
rtw_write32(adapter, REG_HSIMR, tmp | haldata->SysIntrMask);
 
-   RT_TRACE(
-   _module_hci_ops_c_,
-   _drv_notice_,
-   (
-   "%s: enable HSIMR = 0x%08X\n",
-   __func__,
-   haldata->SysIntrMask
-   )
-   );
+   pr_notice("%s %s: enable HSIMR = 0x%08X\n",
+ DRIVER_PREFIX, __func__, haldata->SysIntrMask);
 
/*  */
/*   There are some C2H CMDs have been sent before system 
interrupt is enabled, e.g., C2H, CPWM. */
@@ -894,7 +880,7 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter 
*adapter, u32 size)
readbuf = recvbuf->pskb->data;
ret = sdio_read_port(&adapter->iopriv.intf, WLAN_RX0FF_DEVICE_ID, 
readsize, readbuf);
if (ret == _FAIL) {
-   RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("%s: read port 
FAIL!\n", __func__));
+   pr_err("%s %s: read port FAIL!\n", DRIVER_PREFIX, __func__);
return NULL;
}
 
@@ -1062,9 +1048,8 @@ void sd_int_hdl(struct adapter *adapter)
 
sd_int_dpc(adapter);
} else {
-   RT_TRACE(_module_hci_ops_c_, _drv_err_,
-   ("%s: HISR(0x%08x) and HIMR(0x%08x) not 
match!\n",
-   __func__, hal->sdio_hisr, hal->sdio_himr));
+   pr_err("%s %s: HISR(0x%08x) and HIMR(0x%08x) not match!\n",
+  DRIVER_PREFIX, __func__, hal->sdio_hisr, hal->sdio_himr);
}
 }
 
@@ -1088,13 +1073,12 @@ u8 HalQueryTxBufferStatus8723BSdio(struct adapter 
*adapter)
numof_free_page = SdioLocalCmd53Read4Byte(adapter, SDIO_REG_FREE_TXPG);
 
memcpy(hal->SdioTxFIFOFreePage, &numof_free_page, 4);
-   RT_TRACE(_module_hci_ops_c_, _drv_notice_,
-   ("%s: Free page for HIQ(%#x), MIDQ(%#x), LOWQ(%#x), 
PUBQ(%#x)\n",
-   __func__,
-   hal->SdioTxFIFOFreePage[HI_QUEUE_IDX],
-   hal->SdioTxFIFOFreePage[MID_QUEUE_IDX],
-   hal->SdioTxFIFOFreePage[LOW_QUEUE_IDX],
-   hal->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX]));
+   pr_notice("%s %s: Free page for HIQ(%#x), MIDQ(%#x), LOWQ(%#x), 
PUBQ(%#x)\n",
+ DRIVER_PREFIX, __func__,
+ hal->SdioTxFIFOFreePage[HI_QUEUE_IDX],
+ hal->SdioTxFIFOFreePage[MID_QUEUE_IDX],
+ hal->SdioTxFIFOFreePage[LOW_QUEUE_IDX],
+ hal->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX]);
 
return true;
 }
-- 
2.20.1

[PATCH 25/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723bs_xmit.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c| 42 ++-
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c 
b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 597cf3a88c51..ad27ba1592ed 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -102,11 +102,8 @@ static s32 rtl8723_dequeue_writeport(struct adapter 
*padapter)
(padapter->bSurpriseRemoved) ||
(padapter->bDriverStopped)
) {
-   RT_TRACE(
-   _module_hal_xmit_c_,
-   _drv_notice_,
-   ("%s: bSurpriseRemoved(write port)\n", __func__)
-   );
+   pr_notice("%s %s: bSurpriseRemoved(write port)\n",
+ DRIVER_PREFIX, __func__);
goto free_xmitbuf;
}
 
@@ -151,16 +148,9 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
 
ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved);
if (ret) {
-   RT_TRACE(
-   _module_hal_xmit_c_,
-   _drv_err_,
-   (
-   "%s: bDriverStopped(%d) 
bSurpriseRemoved(%d)!\n",
-   __func__,
-   padapter->bDriverStopped,
-   padapter->bSurpriseRemoved
-   )
-   );
+   pr_err("%s %s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n",
+  DRIVER_PREFIX, __func__, padapter->bDriverStopped,
+  padapter->bSurpriseRemoved);
return _FAIL;
}
 
@@ -374,7 +364,8 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct 
xmit_priv *pxmitpriv
 
/*  dump xmit_buf to hw tx fifo */
if (pxmitbuf) {
-   RT_TRACE(_module_hal_xmit_c_, _drv_info_, 
("pxmitbuf->len =%d enqueue\n", pxmitbuf->len));
+   pr_info("%s pxmitbuf->len =%d enqueue\n",
+   DRIVER_PREFIX, pxmitbuf->len);
 
if (pxmitbuf->len > 0) {
struct xmit_frame *pframe;
@@ -424,16 +415,9 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
(padapter->bDriverStopped) ||
(padapter->bSurpriseRemoved)
) {
-   RT_TRACE(
-   _module_hal_xmit_c_,
-   _drv_notice_,
-   (
-   "%s: bDriverStopped(%d) bSurpriseRemoved(%d)\n",
-   __func__,
-   padapter->bDriverStopped,
-   padapter->bSurpriseRemoved
-   )
-   );
+   pr_notice("%s %s: bDriverStopped(%d) bSurpriseRemoved(%d)\n",
+ DRIVER_PREFIX, __func__, padapter->bDriverStopped,
+ padapter->bSurpriseRemoved);
return _FAIL;
}
 
@@ -492,7 +476,7 @@ int rtl8723bs_xmit_thread(void *context)
 
complete(&pxmitpriv->SdioXmitTerminate);
 
-   RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("-%s\n", __func__));
+   pr_notice("%s-%s\n", DRIVER_PREFIX, __func__);
 
thread_exit();
 }
@@ -509,7 +493,7 @@ s32 rtl8723bs_mgnt_xmit(
u8 *pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
u8 txdesc_size = TXDESC_SIZE;
 
-   RT_TRACE(_module_hal_xmit_c_, _drv_info_, ("+%s\n", __func__));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
pattrib = &pmgntframe->attrib;
pxmitbuf = pmgntframe->pxmitbuf;
@@ -572,7 +556,7 @@ s32 rtl8723bs_hal_xmit(
err = rtw_xmitframe_enqueue(padapter, pxmitframe);
spin_unlock_bh(&pxmitpriv->lock);
if (err != _SUCCESS) {
-   RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("rtl8723bs_hal_xmit: 
enqueue xmitframe fail\n"));
+   pr_err("%s %s: enqueue xmitframe fail\n", DRIVER_PREFIX, 
__func__);
rtw_free_xmitframe(pxmitpriv, pxmitframe);
 
pxmitpriv->tx_drop++;
-- 
2.20.1

[PATCH 29/40] staging: rtl8723bs: remove commented RT_TRACE calls in hal/rtl8723b_rf6052.c

[Fabio Aiuto]

remove commented RT_TRACE calls in hal/rtl8723b_rf6052.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
index 73b47f053549..38228b46b1ee 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
@@ -74,7 +74,6 @@ void PHY_RF6052SetBandwidth8723B(
break;
 
default:
-   /* RT_TRACE(COMP_DBG, DBG_LOUD, ("PHY_SetRF8225Bandwidth(): 
unknown Bandwidth: %#X\n", Bandwidth)); */
break;
}
 
@@ -153,7 +152,6 @@ static int phy_RF6052_Config_ParaFile(struct adapter 
*Adapter)
 
ODM_ConfigRFWithTxPwrTrackHeaderFile(&pHalData->odmpriv);
 
-   /* RT_TRACE(COMP_INIT, DBG_LOUD, 
("<---phy_RF6052_Config_ParaFile()\n")); */
return _SUCCESS;
 }
 
-- 
2.20.1

[PATCH 24/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/hal_intf.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c 
b/drivers/staging/rtl8723bs/hal/hal_intf.c
index aa4356327636..87de2a3bda4e 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -108,7 +108,7 @@ uint rtw_hal_init(struct adapter *padapter)
DBG_871X("rtw_hal_init: hal__init fail\n");
}
 
-   RT_TRACE(_module_hal_init_c_, _drv_err_, ("-rtl871x_hal_init:status = 
0x%x\n", status));
+   pr_err("%s -%s:status = 0x%x\n", DRIVER_PREFIX, __func__, status);
 
return status;
 }
-- 
2.20.1

[PATCH 30/40] staging: rtl8723bs: remove commented RT_TRACE calls in os_dep/ioctl_linux.c

[Fabio Aiuto]

remove commented RT_TRACE calls in os_dep/ioctl_linux.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 354441e6a667..aee4932162a9 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -4231,7 +4231,6 @@ static int rtw_wx_set_priv(struct net_device *dev,
struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_point *dwrq = (struct iw_point *)awrq;
 
-   /* RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, 
("+rtw_wx_set_priv\n")); */
if (dwrq->length == 0)
return -EFAULT;
 
@@ -4245,11 +4244,6 @@ static int rtw_wx_set_priv(struct net_device *dev,
return -EFAULT;
}
 
-
-   /* RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, */
-   /*   ("rtw_wx_set_priv: %s req =%s\n", */
-   /*dev->name, ext)); */
-
#ifdef DEBUG_RTW_WX_SET_PRIV
ext_dbg = vmalloc(len);
if (!ext_dbg) {
-- 
2.20.1

[PATCH 31/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/ioctl_linux.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/os_dep/ioctl_linux.c| 81 ++-
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index aee4932162a9..c67064ddc88a 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -232,8 +232,10 @@ static char *translate_scan(struct adapter *padapter,
u16 wpa_len = 0, rsn_len = 0;
u8 *p;
rtw_get_sec_ie(pnetwork->network.IEs, 
pnetwork->network.IELength, rsn_ie, &rsn_len, wpa_ie, &wpa_len);
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("rtw_wx_get_scan: ssid =%s\n", pnetwork->network.Ssid.Ssid));
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, 
("rtw_wx_get_scan: wpa_len =%d rsn_len =%d\n", wpa_len, rsn_len));
+   pr_info("%s rtw_wx_get_scan: ssid =%s\n", DRIVER_PREFIX,
+   pnetwork->network.Ssid.Ssid);
+   pr_info("%s rtw_wx_get_scan: wpa_len =%d rsn_len =%d\n",
+   DRIVER_PREFIX, wpa_len, rsn_len);
 
buf = kzalloc(MAX_WPA_IE_LEN*2, GFP_ATOMIC);
if (!buf)
@@ -423,7 +425,7 @@ static int wpa_set_encryption(struct net_device *dev, 
struct ieee_param *param,
}
 
if (strcmp(param->u.crypt.alg, "WEP") == 0) {
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, 
("wpa_set_encryption, crypt.alg = WEP\n"));
+   pr_err("%s %s, crypt.alg = WEP\n", DRIVER_PREFIX, __func__);
DBG_871X("wpa_set_encryption, crypt.alg = WEP\n");
 
padapter->securitypriv.ndisencryptstatus = 
Ndis802_11Encryption1Enabled;
@@ -433,20 +435,21 @@ static int wpa_set_encryption(struct net_device *dev, 
struct ieee_param *param,
wep_key_idx = param->u.crypt.idx;
wep_key_len = param->u.crypt.key_len;
 
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, 
("(1)wep_key_idx =%d\n", wep_key_idx));
+   pr_info("%s (1)wep_key_idx =%d\n", DRIVER_PREFIX, wep_key_idx);
DBG_871X("(1)wep_key_idx =%d\n", wep_key_idx);
 
if (wep_key_idx > WEP_KEYS)
return -EINVAL;
 
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, 
("(2)wep_key_idx =%d\n", wep_key_idx));
+   pr_info("%s (2)wep_key_idx =%d\n", DRIVER_PREFIX, wep_key_idx);
 
if (wep_key_len > 0) {
wep_key_len = wep_key_len <= 5 ? 5 : 13;
wep_total_len = wep_key_len + FIELD_OFFSET(struct 
ndis_802_11_wep, KeyMaterial);
pwep = kzalloc(wep_total_len, GFP_KERNEL);
if (pwep == NULL) {
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, 
(" wpa_set_encryption: pwep allocate fail !!!\n"));
+   pr_err("%s %s: pwep allocate fail !!!\n",
+  DRIVER_PREFIX, __func__);
goto exit;
}
 
@@ -612,7 +615,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char 
*pie, unsigned short ie
}
 
if (ielen < RSN_HEADER_LEN) {
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("Ie 
len too short %d\n", ielen));
+   pr_err("%s Ie len too short %d\n", DRIVER_PREFIX, 
ielen);
ret  = -1;
goto exit;
}
@@ -715,9 +718,12 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char 
*pie, unsigned short ie
 /*  check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == 
true) */
 rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr);
 
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_,
-("rtw_set_wpa_ie: pairwise_cipher = 0x%08x 
padapter->securitypriv.ndisencryptstatus =%d 
padapter->securitypriv.ndisauthtype =%d\n",
- pairwise_cipher, padapter->securitypriv.ndisencryptstatus, 
padapter->securitypriv.ndisauthtype));
+   pr_info("%s %s: pairwise_cipher = 0x%08x "
+   "padapter->securitypriv.ndisencryptstatus =%d "
+   "padapter->securitypriv.ndisauthtype =%d\n",
+   DRIVER_PREFIX, __func__, pairwise_cipher,
+   padapter->securitypriv.ndisencryptstatus,
+   padapter->securitypriv.ndisauthtype);
 
 exit:
 
@@ -738,7 +744,7 @@ static int rtw_wx_get_nam

[PATCH 32/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/mlme_linux.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c 
b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
index ba4d3789a41e..bda0c34f2086 100644
--- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
@@ -145,11 +145,11 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 
authmode, u8 *sec_ie)
u8 *buff, *p, i;
union iwreq_data wrqu;
 
-   RT_TRACE(_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, 
authmode =%d\n", authmode));
+   pr_info("%s+%s, authmode =%d\n", DRIVER_PREFIX, __func__, authmode);
 
buff = NULL;
if (authmode == WLAN_EID_VENDOR_SPECIFIC) {
-   RT_TRACE(_module_mlme_osdep_c_, _drv_info_, 
("rtw_report_sec_ie, authmode =%d\n", authmode));
+   pr_info("%s %s, authmode =%d\n", DRIVER_PREFIX, __func__, 
authmode);
 
buff = rtw_zmalloc(IW_CUSTOM_MAX);
if (NULL == buff) {
-- 
2.20.1

[PATCH 35/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/os_intfs.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 65 ++---
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c 
b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 405aa95af579..1c6530d34cb8 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -479,7 +479,7 @@ struct net_device *rtw_init_netdev(struct adapter 
*old_padapter)
struct adapter *padapter;
struct net_device *pnetdev;
 
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
if (old_padapter)
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct 
adapter), (void *)old_padapter);
@@ -529,7 +529,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
 {
u32 _status = _SUCCESS;
 
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_start_drv_threads\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
padapter->xmitThread = kthread_run(rtw_xmit_thread, padapter, 
"RTW_XMIT_THREAD");
if (IS_ERR(padapter->xmitThread))
_status = _FAIL;
@@ -546,14 +546,14 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
 
 void rtw_stop_drv_threads(struct adapter *padapter)
 {
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
rtw_stop_cmd_thread(padapter);
 
/*  Below is to termindate tx_thread... */
complete(&padapter->xmitpriv.xmit_comp);
wait_for_completion(&padapter->xmitpriv.terminate_xmitthread_comp);
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("\n drv_halt: 
rtw_xmit_thread can be terminated !\n"));
+   pr_info("%s drv_halt: rtw_xmit_thread can be terminated !\n", 
DRIVER_PREFIX);
 
rtw_hal_stop_thread(padapter);
 }
@@ -697,14 +697,14 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
 {
u8 ret8 = _SUCCESS;
 
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_init_drv_sw\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
rtw_init_default_value(padapter);
 
rtw_init_hal_com_default_value(padapter);
 
if (rtw_init_cmd_priv(&padapter->cmdpriv)) {
-   RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init 
cmd_priv\n"));
+   pr_err("%s %s Can't init cmd_priv\n", DRIVER_PREFIX, __func__);
ret8 = _FAIL;
goto exit;
}
@@ -712,14 +712,14 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
padapter->cmdpriv.padapter = padapter;
 
if (rtw_init_evt_priv(&padapter->evtpriv)) {
-   RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init 
evt_priv\n"));
+   pr_err("%s Can't init evt_priv\n", DRIVER_PREFIX);
ret8 = _FAIL;
goto exit;
}
 
 
if (rtw_init_mlme_priv(padapter) == _FAIL) {
-   RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init 
mlme_priv\n"));
+   pr_err("%s Can't init mlme_priv\n", DRIVER_PREFIX);
ret8 = _FAIL;
goto exit;
}
@@ -760,29 +760,29 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
 
 exit:
 
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n"));
+   pr_info("%s-%s\n", DRIVER_PREFIX, __func__);
 
return ret8;
 }
 
 void rtw_cancel_all_timer(struct adapter *padapter)
 {
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_cancel_all_timer\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
del_timer_sync(&padapter->mlmepriv.assoc_timer);
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel 
association timer complete!\n"));
+   pr_info("%s %s:cancel association timer complete!\n", DRIVER_PREFIX, 
__func__);
 
del_timer_sync(&padapter->mlmepriv.scan_to_timer);
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel 
scan_to_timer!\n"));
+   pr_info("%s %s:cancel scan_to_timer!\n", DRIVER_PREFIX, __func__);
 
del_timer_sync(&padapter->mlmepriv.dynamic_chk_timer);
-   RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer:cancel 
dynamic_chk_timer!\n"));
+   pr_info("%s %s:cancel dynamic_chk_timer!\n", DRIVER_PREFIX, __func__);
 
del_timer_sync(&(adapter_to_pwrctl(padapter)->pwr_state_check_timer));
 
del_timer_sync(&padapter->mlmepriv.set_s

[PATCH 33/40] staging: rtl8723bs: fix string format in os_dep/ioctl_cfg80211.c

[Fabio Aiuto]

fix string format in log message in os_dep/ioctl_cfg80211.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 4f6398f86b75..260d9fa739ef 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1797,7 +1797,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter 
*padapter, u8 *pie, size_t iel
}
 
if (ielen < RSN_HEADER_LEN) {
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("Ie len too 
short %d\n", ielen));
+   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("Ie len too 
short %ld\n", ielen));
ret  = -1;
goto exit;
}
-- 
2.20.1

[PATCH 39/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/osdep_service.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c 
b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index 843003b91ea2..db979403e16a 100644
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -161,7 +161,7 @@ int rtw_change_ifname(struct adapter *padapter, const char 
*ifname)
ret = register_netdevice(pnetdev);
 
if (ret != 0) {
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("register_netdev() 
failed\n"));
+   pr_err("%s register_netdev() failed\n", DRIVER_PREFIX);
goto error;
}
 
-- 
2.20.1

[PATCH 36/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/recv_linux.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 22 ++-
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c 
b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index fbdbcd04d44a..5e1ee9783c32 100644
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -202,13 +202,19 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union 
recv_frame *precv_frame
 
skb = precv_frame->u.hdr.pkt;
if (skb == NULL) {
-   RT_TRACE(_module_recv_osdep_c_, _drv_err_, 
("rtw_recv_indicatepkt():skb == NULL something wrong\n"));
+   pr_err("%s %s:skb == NULL something wrong\n",
+  DRIVER_PREFIX, __func__);
goto _recv_indicatepkt_drop;
}
 
-   RT_TRACE(_module_recv_osdep_c_, _drv_info_, 
("rtw_recv_indicatepkt():skb != NULL !!!\n"));
-   RT_TRACE(_module_recv_osdep_c_, _drv_info_, 
("rtw_recv_indicatepkt():precv_frame->u.hdr.rx_head =%p  
precv_frame->hdr.rx_data =%p\n", precv_frame->u.hdr.rx_head, 
precv_frame->u.hdr.rx_data));
-   RT_TRACE(_module_recv_osdep_c_, _drv_info_, ("precv_frame->hdr.rx_tail 
=%p precv_frame->u.hdr.rx_end =%p precv_frame->hdr.len =%d\n", 
precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end, precv_frame->u.hdr.len));
+   pr_info("%s %s:skb != NULL !!!\n", DRIVER_PREFIX, __func__);
+   pr_info("%s %s:precv_frame->u.hdr.rx_head =%p  "
+   "precv_frame->hdr.rx_data =%p\n", DRIVER_PREFIX, __func__,
+   precv_frame->u.hdr.rx_head, precv_frame->u.hdr.rx_data);
+   pr_info("%s precv_frame->hdr.rx_tail =%p precv_frame->u.hdr.rx_end =%p "
+   "precv_frame->hdr.len =%d\n", DRIVER_PREFIX,
+   precv_frame->u.hdr.rx_tail, precv_frame->u.hdr.rx_end,
+   precv_frame->u.hdr.len);
 
skb->data = precv_frame->u.hdr.rx_data;
 
@@ -216,7 +222,10 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union 
recv_frame *precv_frame
 
skb->len = precv_frame->u.hdr.len;
 
-   RT_TRACE(_module_recv_osdep_c_, _drv_info_, ("\n skb->head =%p 
skb->data =%p skb->tail =%p skb->end =%p skb->len =%d\n", skb->head, skb->data, 
skb_tail_pointer(skb), skb_end_pointer(skb), skb->len));
+   pr_info("%s skb->head =%p skb->data =%p skb->tail =%p "
+   "skb->end =%p skb->len =%d\n", DRIVER_PREFIX,
+   skb->head, skb->data, skb_tail_pointer(skb),
+   skb_end_pointer(skb), skb->len);
 
rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
 
@@ -225,7 +234,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union 
recv_frame *precv_frame
 
rtw_free_recvframe(precv_frame, pfree_recv_queue);
 
-   RT_TRACE(_module_recv_osdep_c_, _drv_info_, ("\n rtw_recv_indicatepkt 
:after rtw_os_recv_indicate_pkt\n"));
+   pr_info("%s %s: after rtw_os_recv_indicate_pkt\n",
+   DRIVER_PREFIX, __func__);
 
return _SUCCESS;
 
-- 
2.20.1

[PATCH 40/40] staging: rtl8723bs: remove obsolete debug macro

[Fabio Aiuto]

remove obsolete debug macro RT_TRACE

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/include/rtw_debug.h | 17 -
 1 file changed, 17 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_debug.h 
b/drivers/staging/rtl8723bs/include/rtw_debug.h
index 4c0857241922..f539d8e7f89f 100644
--- a/drivers/staging/rtl8723bs/include/rtw_debug.h
+++ b/drivers/staging/rtl8723bs/include/rtw_debug.h
@@ -131,7 +131,6 @@
#define _MODULE_DEFINE_ _module_efuse_
 #endif
 
-#define RT_TRACE(_Comp, _Level, Fmt) do {} while (0)
 #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) do 
{} while (0)
 
 #define DBG_871X(x, ...) do {} while (0)
@@ -217,22 +216,6 @@
 #endif /* defined(_dbgdump) */
 #endif /* DEBUG */
 
-#ifdef DEBUG_RTL871X
-
-#ifdefined(_dbgdump) && defined(_MODULE_DEFINE_)
-
-   #undef RT_TRACE
-   #define RT_TRACE(_Comp, _Level, Fmt)\
-   do {\
-   if ((_Comp & GlobalDebugComponents) && (_Level <= 
GlobalDebugLevel)) {\
-   _dbgdump("%s [0x%08x,%d]", DRIVER_PREFIX, (unsigned 
int)_Comp, _Level);\
-   _dbgdump Fmt;\
-   } \
-   } while (0)
-
-#endif /* defined(_dbgdump) && defined(_MODULE_DEFINE_) */
-#endif /* DEBUG_RTL871X */
-
 void dump_drv_version(void *sel);
 void dump_log_level(void *sel);
 
-- 
2.20.1

[PATCH 37/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/sdio_intf.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index b6be1423ef75..e99c6f72cff6 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -160,7 +160,7 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
int err;
 
 
-   RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+sdio_deinit\n"));
+   pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
 
func = dvobj->intf_data.func;
 
@@ -201,7 +201,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func 
*func)
psdio->func = func;
 
if (sdio_init(dvobj) != _SUCCESS) {
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: initialize SDIO 
Failed!\n", __func__));
+   pr_err("%s %s: initialize SDIO Failed!\n", DRIVER_PREFIX, 
__func__);
goto free_dvobj;
}
rtw_reset_continual_io_error(dvobj);
@@ -306,8 +306,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv 
*dvobj, const struct
padapter->intf_free_irq = &sdio_free_irq;
 
if (rtw_init_io_priv(padapter, sdio_set_intf_ops) == _FAIL) {
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_,
-   ("rtw_drv_init: Can't init io_priv\n"));
+   pr_err("%s rtw_drv_init: Can't init io_priv\n", DRIVER_PREFIX);
goto free_hal_data;
}
 
@@ -322,8 +321,8 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv 
*dvobj, const struct
 
/* 3 7. init driver common data */
if (rtw_init_drv_sw(padapter) == _FAIL) {
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_,
-("rtw_drv_init: Initialize driver software resource 
Failed!\n"));
+   pr_err("%s rtw_drv_init: Initialize driver software resource 
Failed!\n",
+  DRIVER_PREFIX);
goto free_hal_data;
}
 
@@ -406,7 +405,7 @@ static int rtw_drv_init(
 
dvobj = sdio_dvobj_init(func);
if (dvobj == NULL) {
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("initialize device 
object priv Failed!\n"));
+   pr_err("%s initialize device object priv Failed!\n", 
DRIVER_PREFIX);
goto exit;
}
 
@@ -424,7 +423,7 @@ static int rtw_drv_init(
if (sdio_alloc_irq(dvobj) != _SUCCESS)
goto free_if2;
 
-   RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-871x_drv - drv_init, 
success!\n"));
+   pr_err("%s-871x_drv - drv_init, success!\n", DRIVER_PREFIX);
 
rtw_ndev_notifier_register();
status = _SUCCESS;
@@ -447,7 +446,7 @@ static void rtw_dev_remove(struct sdio_func *func)
struct dvobj_priv *dvobj = sdio_get_drvdata(func);
struct adapter *padapter = dvobj->if1;
 
-   RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+rtw_dev_remove\n"));
+   pr_notice("%s+%s\n", DRIVER_PREFIX, __func__);
 
dvobj->processing_dev_remove = true;
 
@@ -479,7 +478,7 @@ static void rtw_dev_remove(struct sdio_func *func)
 
sdio_dvobj_deinit(func);
 
-   RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("-rtw_dev_remove\n"));
+   pr_notice("%s - %s\n", DRIVER_PREFIX, __func__);
 }
 
 static int rtw_sdio_suspend(struct device *dev)
-- 
2.20.1

[PATCH 38/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/xmit_linux.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c 
b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
index 216b2f62eefd..50c381d7e734 100644
--- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
@@ -196,10 +196,10 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct 
net_device *pnetdev)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0;
 
-   RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n"));
+   pr_info("%s+%s\n", DRIVER_PREFIX, __func__);
 
if (rtw_if_up(padapter) == false) {
-   RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: 
rtw_if_up fail\n"));
+   pr_err("%s %s: rtw_if_up fail\n", DRIVER_PREFIX, __func__);
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__);
#endif
@@ -232,13 +232,15 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct 
net_device *pnetdev)
goto drop_packet;
}
 
-   RT_TRACE(_module_xmit_osdep_c_, _drv_info_, ("rtw_xmit_entry: tx_pkts 
=%d\n", (u32)pxmitpriv->tx_pkts));
+   pr_info("%s %s: tx_pkts =%d\n", DRIVER_PREFIX, __func__,
+   (u32)pxmitpriv->tx_pkts);
goto exit;
 
 drop_packet:
pxmitpriv->tx_drop++;
dev_kfree_skb_any(pkt);
-   RT_TRACE(_module_xmit_osdep_c_, _drv_notice_, ("rtw_xmit_entry: drop, 
tx_drop =%d\n", (u32)pxmitpriv->tx_drop));
+   pr_notice("%s %s: drop, tx_drop =%d\n", DRIVER_PREFIX,
+ __func__, (u32)pxmitpriv->tx_drop);
 
 exit:
return 0;
-- 
2.20.1

[PATCH 34/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in os_dep/ioctl_cfg80211.c

[Fabio Aiuto]

replace private macro RT_TRACE for tracing with in-kernel
pr_* printk wrappers

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 260d9fa739ef..6df2f1e12bd3 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -875,7 +875,7 @@ static int rtw_cfg80211_set_encryption(struct net_device 
*dev, struct ieee_param
 
if (strcmp(param->u.crypt.alg, "WEP") == 0)
{
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, 
("wpa_set_encryption, crypt.alg = WEP\n"));
+   pr_err("%s wpa_set_encryption, crypt.alg = WEP\n", 
DRIVER_PREFIX);
DBG_8192C("wpa_set_encryption, crypt.alg = WEP\n");
 
wep_key_idx = param->u.crypt.idx;
@@ -1797,7 +1797,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter 
*padapter, u8 *pie, size_t iel
}
 
if (ielen < RSN_HEADER_LEN) {
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("Ie len too 
short %ld\n", ielen));
+   pr_err("%s Ie len too short %ld\n", DRIVER_PREFIX, ielen);
ret  = -1;
goto exit;
}
@@ -1901,9 +1901,13 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter 
*padapter, u8 *pie, size_t iel
/*  check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == true) 
*/
rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr);
 
-   RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_,
-   ("rtw_set_wpa_ie: pairwise_cipher = 0x%08x 
padapter->securitypriv.ndisencryptstatus =%d 
padapter->securitypriv.ndisauthtype =%d\n",
-   pairwise_cipher, padapter->securitypriv.ndisencryptstatus, 
padapter->securitypriv.ndisauthtype));
+   pr_info("%s rtw_set_wpa_ie: pairwise_cipher = 0x%08x "
+   "padapter->securitypriv.ndisencryptstatus =%d "
+   "padapter->securitypriv.ndisauthtype =%d\n",
+   DRIVER_PREFIX,
+   pairwise_cipher,
+   padapter->securitypriv.ndisencryptstatus,
+   padapter->securitypriv.ndisauthtype);
 
 exit:
kfree(buf);
-- 
2.20.1

[PATCH 28/40] staging: rtl8723bs: remove commented RT_TRACE calls in hal/HalPhyRf_8723B.c

[Fabio Aiuto]

remove commented RT_TRACE calls in hal/HalPhyRf_8723B.c

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c 
b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 12f0e3601531..c36513812d9d 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -1847,7 +1847,6 @@ void PHY_IQCalibrate_8723B(
bResult = FAIL;
break;
}
-   /* RT_TRACE(_module_mp_, _drv_notice_, ("Switch to S1 
TxIQC(offset, data) = (0x%X, 0x%X)\n", offset, data)); */
PHY_SetBBReg(pDM_Odm->Adapter, offset, bMaskDWord, 
data);
}
 
@@ -1864,7 +1863,6 @@ void PHY_IQCalibrate_8723B(
bResult = FAIL;
break;
}
-   /* RT_TRACE(_module_mp_, _drv_notice_, ("Switch to S1 
RxIQC (offset, data) = (0x%X, 0x%X)\n", offset, data)); */
PHY_SetBBReg(pDM_Odm->Adapter, offset, bMaskDWord, 
data);
}
 
@@ -1950,7 +1948,6 @@ void PHY_IQCalibrate_8723B(
}
}
}
-/* RT_TRACE(COMP_INIT, DBG_LOUD, ("Release Mutex in IQCalibrate\n")); */
 
for (i = 0; i < 4; i++) {
RegE94 = result[i][0];
-- 
2.20.1

Re: [PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c

[Fabio Aiuto]

On Wed, Mar 31, 2021 at 12:27:20PM +0200, Greg KH wrote:
> On Wed, Mar 31, 2021 at 11:39:31AM +0200, Fabio Aiuto wrote:
> > replace private macro RT_TRACE for tracing with in-kernel
> > pr_* printk wrappers
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++---
> >  1 file changed, 13 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
> > b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > index 3cbd65dee741..6176d741d60e 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > @@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 
> > count)
> >  _func_enter_;
> >  
> > if (padapter->bSurpriseRemoved == true) {
> > -   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
> > ("padapter->bSurpriseRemoved==true"));

I looked at this ---^
and so I thought that pr_err was good...

> > +   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
> 
> As Dan said, this is not the same thing.  You are now always printing
> out this mess, when before you were not unless you explicitly enabled
> "tracing".
> 
> And you are sending it to the error log?
> 
> And finally, drivers should never be using pr_*() for messages, they
> should be using dev_*() instead as they are a driver and have access to
> a device pointer.
> 

thank you, I didn't know about dev_*

> thanks,
> 
> greg k-h

my aim was remove private macros replicating component tracing and log levels...

so what's best? Keep a simplyfied RT_TRACE encapsulating a dev_* call?

thank you,

fabio

Re: [PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c

[Fabio Aiuto]

On Wed, Mar 31, 2021 at 12:27:20PM +0200, Greg KH wrote:
> On Wed, Mar 31, 2021 at 11:39:31AM +0200, Fabio Aiuto wrote:
> > replace private macro RT_TRACE for tracing with in-kernel
> > pr_* printk wrappers
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++---
> >  1 file changed, 13 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
> > b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > index 3cbd65dee741..6176d741d60e 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > @@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 
> > count)
> >  _func_enter_;
> >  
> > if (padapter->bSurpriseRemoved == true) {
> > -   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
> > ("padapter->bSurpriseRemoved==true"));
> > +   pr_err("%s padapter->bSurpriseRemoved==true", DRIVER_PREFIX);
> 
> As Dan said, this is not the same thing.  You are now always printing
> out this mess, when before you were not unless you explicitly enabled
> "tracing".

RT_TRACE is enabled if is defined the symbol DEBUG_RTL871X. It doesn't seem to 
be related 
to tracing. DEBUG_RTL871X is never declared, is commented out in 
rtl8723bs/include/autoconf.h

that's why RT_TRACE is never printed. If we try to uncomment the symbol 
definition we have some
comiling errors..

> 
> And you are sending it to the error log?
> 
> And finally, drivers should never be using pr_*() for messages, they
> should be using dev_*() instead as they are a driver and have access to
> a device pointer.
> 
> thanks,
> 
> greg k-h

I still wonder what's best...

thanks,

fabio

Re: [PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c

[Fabio Aiuto]

On Wed, Mar 31, 2021 at 01:14:18PM +0200, Greg KH wrote:
> On Wed, Mar 31, 2021 at 12:55:51PM +0200, Fabio Aiuto wrote:
> > On Wed, Mar 31, 2021 at 12:27:20PM +0200, Greg KH wrote:
> > > On Wed, Mar 31, 2021 at 11:39:31AM +0200, Fabio Aiuto wrote:
> > > > replace private macro RT_TRACE for tracing with in-kernel
> > > > pr_* printk wrappers
> > > > 
> > > > Signed-off-by: Fabio Aiuto 
> > > > ---
> > > >  drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++---
> > > >  1 file changed, 13 insertions(+), 13 deletions(-)
> > > > 
> > > > diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
> > > > b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > index 3cbd65dee741..6176d741d60e 100644
> > > > --- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > +++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > @@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 
> > > > count)
> > > >  _func_enter_;
> > > >  
> > > > if (padapter->bSurpriseRemoved == true) {
> > > > -   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
> > > > ("padapter->bSurpriseRemoved==true"));
> > > > +   pr_err("%s padapter->bSurpriseRemoved==true", 
> > > > DRIVER_PREFIX);
> > > 
> > > As Dan said, this is not the same thing.  You are now always printing
> > > out this mess, when before you were not unless you explicitly enabled
> > > "tracing".
> > 
> > RT_TRACE is enabled if is defined the symbol DEBUG_RTL871X. It doesn't seem 
> > to be related 
> > to tracing. DEBUG_RTL871X is never declared, is commented out in 
> > rtl8723bs/include/autoconf.h
> 
> That's a good sign this is never used and should just all be removed.
> 
> > that's why RT_TRACE is never printed. If we try to uncomment the symbol 
> > definition we have some
> > comiling errors..
> 
> What errors do you get?

If I declare DEBUG and DEBUG_RTL871X to activate private tracing..

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c 
b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 9b16265b543d..f84e0e54cc9c 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -1717,7 +1717,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 
reg_pwr_tbl_sel,
idx_rate_sctn = get_rate_sctn_idx(data_rate);
 
if (band_type == BAND_ON_5G && idx_rate_sctn == 0)
-   DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", DataRate);
+   DBG_871X("Wrong rate 0x%x: No CCK in 5G Band\n", data_rate);

here I have to fix a variable name ---^
to let the code compile.

but it won't compile yet, there are more of those errors, in both DBG_871X and
RT_TRACE macro.

 
/*  workaround for wrong index combination to obtain tx power limit, */
/*  OFDM only exists in BW 20M */
diff --git a/drivers/staging/rtl8723bs/include/autoconf.h 
b/drivers/staging/rtl8723bs/include/autoconf.h
index 996198750814..bece2ed1ef88 100644
--- a/drivers/staging/rtl8723bs/include/autoconf.h
+++ b/drivers/staging/rtl8723bs/include/autoconf.h
@@ -45,10 +45,10 @@
  * Debug Related Config
  */
 #undef DEBUG
-
+#define DEBUG
 #ifdef DEBUG
 #define DBG1   /*  for ODM & BTCOEX debug */
-/*#define DEBUG_RTL871X */
+#define DEBUG_RTL871X 
 #else /*  !DEBUG */
 #define DBG0   /*  for ODM & BTCOEX debug */
 #endif /*  !DEBUG */

^here hand declaration to reproduce
compiling errors


> 
> > > And you are sending it to the error log?
> > > 
> > > And finally, drivers should never be using pr_*() for messages, they
> > > should be using dev_*() instead as they are a driver and have access to
> > > a device pointer.
> > > 
> > > thanks,
> > > 
> > > greg k-h
> > 
> > I still wonder what's best...
> 
> Just delete them all please, they are obviously not used as no one
> rebuilds the source just for this type of thing.
> 
> thanks,
> 
> greg k-h

ok I will delete all RT_TRACE call, and even DBG_871X if you agree...

thank you,

fabio

Re: [PATCH 03/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in core/rtw_eeprom.c

[Fabio Aiuto]

On Wed, Mar 31, 2021 at 12:48:20PM +0200, Greg KH wrote:
> On Wed, Mar 31, 2021 at 12:36:31PM +0200, Fabio Aiuto wrote:
> > On Wed, Mar 31, 2021 at 12:27:20PM +0200, Greg KH wrote:
> > > On Wed, Mar 31, 2021 at 11:39:31AM +0200, Fabio Aiuto wrote:
> > > > replace private macro RT_TRACE for tracing with in-kernel
> > > > pr_* printk wrappers
> > > > 
> > > > Signed-off-by: Fabio Aiuto 
> > > > ---
> > > >  drivers/staging/rtl8723bs/core/rtw_eeprom.c | 26 ++---
> > > >  1 file changed, 13 insertions(+), 13 deletions(-)
> > > > 
> > > > diff --git a/drivers/staging/rtl8723bs/core/rtw_eeprom.c 
> > > > b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > index 3cbd65dee741..6176d741d60e 100644
> > > > --- a/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > +++ b/drivers/staging/rtl8723bs/core/rtw_eeprom.c
> > > > @@ -36,7 +36,7 @@ void shift_out_bits(_adapter *padapter, u16 data, u16 
> > > > count)
> > > >  _func_enter_;
> > > >  
> > > > if (padapter->bSurpriseRemoved == true) {
> > > > -   RT_TRACE(_module_rtl871x_eeprom_c_, _drv_err_, 
> > > > ("padapter->bSurpriseRemoved==true"));
> > 
> > I looked at this ---^
> > and so I thought that pr_err was good...
> 
> But you missed the fact that RT_TRACE() does not always spit this stuff
> out.
> 
> And I don't know what _drv_err_ is, but tracing messages should never go
> to an error log :)

ok, got it 

> 
> > my aim was remove private macros replicating component tracing and log 
> > levels...
> 
> That's a great goal!
> 
> > so what's best? Keep a simplyfied RT_TRACE encapsulating a dev_* call?
> 
> replace them with dev_dbg() is one way, if they really are even needed
> at all.  At this point in time, I would strongly just recommend removing
> them all as no one is using them for anything.
> 
> thanks,
> 
> greg k-h

I will remove then,

thank you,

fabio

[PATCH 01/11] staging: rtl8723bs: delete extern declarations in core/rtw_ap.c

[Fabio Aiuto]

delete extern declaration in .c file (RTW_WPA_OUI) and
fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
14: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:14:
+extern unsigned char WMM_OUI[];
--
WARNING: externs should be avoided in .c files
15: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:15:
+extern unsigned char WPS_OUI[];
--
WARNING: externs should be avoided in .c files
16: FILE: drivers/staging/rtl8723bs/core/rtw_ap.c:16:
+extern unsigned char P2P_OUI[];

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 5 -
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index a01b68274fa0..3cd9c61eec99 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -10,11 +10,6 @@
 #include 
 #include 
 
-extern unsigned char RTW_WPA_OUI[];
-extern unsigned char WMM_OUI[];
-extern unsigned char WPS_OUI[];
-extern unsigned char P2P_OUI[];
-
 void init_mlme_ap_info(struct adapter *padapter)
 {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
-- 
2.20.1

[PATCH 00/11] staging: rtl8723bs: fix extern declaration checkpatch issues

[Fabio Aiuto]

Fix extern declaration issues warned by checkpatch

Fabio Aiuto (11):
  staging: rtl8723bs: delete extern declarations in core/rtw_ap.c
  staging: rtl8723bs: moved function prototypes out of core/rtw_efuse.c
  staging: rtl8723bs: moved function prototype out of
core/rtw_ioctl_set.c and core/rtw_mlme.c
  staging: rtl8723bs: moved function prototypes out of core/rtw_recv.c
  staging: rtl8723bs: remove argument in recv_indicatepkts_pkt_loss_cnt
  staging: rtl8723bs: move function prototype out of core/rtw_recv.c
  staging: rtl8723bs: delete extern declarations in core/rtw_wlan_util.c
  staging: rtl8723bs: move function prototypes out of hal/odm.c
  staging: rtl8723bs: move function prototypes out of os_dep/int_fs.c
  staging: rtl8723bs: remove undefined function prototype in of
os_dep/sdio_intf.c
  staging: rtl8723bs: remove unnecessary extern in os_dep/sdio_intf.c

 drivers/staging/rtl8723bs/core/rtw_ap.c   |  5 --
 drivers/staging/rtl8723bs/core/rtw_efuse.c| 10 ---
 .../staging/rtl8723bs/core/rtw_ioctl_set.c|  1 -
 drivers/staging/rtl8723bs/core/rtw_mlme.c |  2 -
 drivers/staging/rtl8723bs/core/rtw_recv.c | 41 ++-
 .../staging/rtl8723bs/core/rtw_wlan_util.c|  3 -
 drivers/staging/rtl8723bs/hal/odm.c   | 68 ---
 drivers/staging/rtl8723bs/hal/odm.h   | 62 +
 .../staging/rtl8723bs/include/osdep_intf.h|  3 +
 drivers/staging/rtl8723bs/include/rtw_efuse.h |  3 +
 .../staging/rtl8723bs/include/rtw_ioctl_set.h |  2 +
 drivers/staging/rtl8723bs/include/rtw_recv.h  | 53 +++
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   |  3 -
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c  |  3 -
 14 files changed, 129 insertions(+), 130 deletions(-)

-- 
2.20.1

[PATCH 02/11] staging: rtl8723bs: moved function prototypes out of core/rtw_efuse.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
35: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:35:
+bool

moved two function prototypes in include/rtw_efuse.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_efuse.c| 10 --
 drivers/staging/rtl8723bs/include/rtw_efuse.h |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c 
b/drivers/staging/rtl8723bs/core/rtw_efuse.c
index 32ca10f01413..0772397738d4 100644
--- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
@@ -32,11 +32,6 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
 #define REG_EFUSE_CTRL 0x0030
 #define EFUSE_CTRL REG_EFUSE_CTRL  /*  E-Fuse 
Control. */
 
-bool
-Efuse_Read1ByteFromFakeContent(
-   struct adapter *padapter,
-   u16 Offset,
-   u8 *Value);
 bool
 Efuse_Read1ByteFromFakeContent(
struct adapter *padapter,
@@ -53,11 +48,6 @@ Efuse_Read1ByteFromFakeContent(
return true;
 }
 
-bool
-Efuse_Write1ByteToFakeContent(
-   struct adapter *padapter,
-   u16 Offset,
-   u8 Value);
 bool
 Efuse_Write1ByteToFakeContent(
struct adapter *padapter,
diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h 
b/drivers/staging/rtl8723bs/include/rtw_efuse.h
index 5bae46ecd9de..1f304df8c421 100644
--- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
+++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
@@ -103,6 +103,9 @@ extern u8 fakeBTEfuseInitMap[];
 extern u8 fakeBTEfuseModifiedMap[];
 /*Export global variable*/
 
+bool Efuse_Read1ByteFromFakeContent(struct adapter *padapter, u16 Offset, u8 
*Value);
+bool Efuse_Write1ByteToFakeContent(struct adapter *padapter, u16 Offset, u8 
Value);
+
 u16 Efuse_GetCurrentSize(struct adapter *padapter, u8 efuseType, bool 
bPseudoTest);
 u8 Efuse_CalculateWordCnts(u8 word_en);
 void EFUSE_GetEfuseDefinition(struct adapter *padapter, u8 efuseType, u8 type, 
void *pOut, bool bPseudoTest);
-- 
2.20.1

[PATCH 05/11] staging: rtl8723bs: remove argument in recv_indicatepkts_pkt_loss_cnt

[Fabio Aiuto]

remove debug_priv argument so function prototype can be
easily moved away

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 9ef2408ded57..e2a6afed723c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1983,13 +1983,13 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl 
*preorder_ctrl, union rec
 
 }
 
-void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, 
u64 current_seq);
-void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, 
u64 current_seq)
+u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq);
+u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq)
 {
if (current_seq < prev_seq)
-   pdbgpriv->dbg_rx_ampdu_loss_count += (4096 + current_seq - 
prev_seq);
+   return 4096 + current_seq - prev_seq;
else
-   pdbgpriv->dbg_rx_ampdu_loss_count += (current_seq - prev_seq);
+   return current_seq - prev_seq;
 
 }
 
@@ -2029,7 +2029,8 @@ int recv_indicatepkts_in_order(struct adapter *padapter, 
struct recv_reorder_ctr
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", 
__func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
-   recv_indicatepkts_pkt_loss_cnt(pdbgpriv, 
preorder_ctrl->indicate_seq, pattrib->seq_num);
+   pdbgpriv->dbg_rx_ampdu_loss_count += 
recv_indicatepkts_pkt_loss_cnt(
+   preorder_ctrl->indicate_seq, pattrib->seq_num);
preorder_ctrl->indicate_seq = pattrib->seq_num;
 
}
-- 
2.20.1

[PATCH 07/11] staging: rtl8723bs: delete extern declarations in core/rtw_wlan_util.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
28: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:28:
+extern unsigned char RTW_WPA_OUI[];
--
WARNING: externs should be avoided in .c files
29: FILE: drivers/staging/rtl8723bs/core/rtw_wlan_util.c:29:
+extern unsigned char WPA_TKIP_CIPHER[4];

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index bfd55a0356f5..760b0ea4e9bd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -25,9 +25,6 @@ static unsigned char AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5};
 static unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
 static unsigned char WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02};
 
-extern unsigned char RTW_WPA_OUI[];
-extern unsigned char WPA_TKIP_CIPHER[4];
-
 #define R2T_PHY_DELAY  (0)
 
 /* define WAIT_FOR_BCN_TO_MIN  (3000) */
-- 
2.20.1

[PATCH 10/11] staging: rtl8723bs: remove undefined function prototype in of os_dep/sdio_intf.c

[Fabio Aiuto]

fix the following checkpatch issue:

WARNING: externs should be avoided in .c files
486: FILE: drivers/staging/rtl8723bs/os_dep/sdio_intf.c:486:
+extern int pm_netdev_close(struct net_device *pnetdev, u8 bnormal);

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 8f8549eee23e..185919b6963f 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -483,7 +483,6 @@ static void rtw_dev_remove(struct sdio_func *func)
 }
 
 extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
-extern int pm_netdev_close(struct net_device *pnetdev, u8 bnormal);
 
 static int rtw_sdio_suspend(struct device *dev)
 {
-- 
2.20.1

[PATCH 08/11] staging: rtl8723bs: move function prototypes out of hal/odm.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
285: FILE: drivers/staging/rtl8723bs/hal/odm.c:285:
+void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
287: FILE: drivers/staging/rtl8723bs/hal/odm.c:287:
+void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
289: FILE: drivers/staging/rtl8723bs/hal/odm.c:289:
+void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
291: FILE: drivers/staging/rtl8723bs/hal/odm.c:291:
+void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
305: FILE: drivers/staging/rtl8723bs/hal/odm.c:305:
+void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
309: FILE: drivers/staging/rtl8723bs/hal/odm.c:309:
+void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
311: FILE: drivers/staging/rtl8723bs/hal/odm.c:311:
+void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
313: FILE: drivers/staging/rtl8723bs/hal/odm.c:313:
+void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
315: FILE: drivers/staging/rtl8723bs/hal/odm.c:315:
+void odm_SwAntDetectInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
317: FILE: drivers/staging/rtl8723bs/hal/odm.c:317:
+void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
--
WARNING: externs should be avoided in .c files
321: FILE: drivers/staging/rtl8723bs/hal/odm.c:321:
+void odm_GlobalAdapterCheck(void);
--
WARNING: externs should be avoided in .c files
323: FILE: drivers/staging/rtl8723bs/hal/odm.c:323:
+void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
325: FILE: drivers/staging/rtl8723bs/hal/odm.c:325:
+void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
327: FILE: drivers/staging/rtl8723bs/hal/odm.c:327:
+void odm_RateAdaptiveMaskInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
330: FILE: drivers/staging/rtl8723bs/hal/odm.c:330:
+void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
338: FILE: drivers/staging/rtl8723bs/hal/odm.c:338:
+void odm_InitHybridAntDiv(struct dm_odm_t *pDM_Odm);
--
WARNING: externs should be avoided in .c files
340: FILE: drivers/staging/rtl8723bs/hal/odm.c:340:
+bool odm_StaDefAntSel(
--
WARNING: externs should be avoided in .c files
349: FILE: drivers/staging/rtl8723bs/hal/odm.c:349:
+void odm_SetRxIdleAnt(struct dm_odm_t *pDM_Odm, u8 Ant, bool bDualPath);
--
WARNING: externs should be avoided in .c files
353: FILE: drivers/staging/rtl8723bs/hal/odm.c:353:
+void odm_HwAntDiv(struct dm_odm_t *pDM_Odm);

moved function prototypes in hal/odm.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/hal/odm.c | 68 -
 drivers/staging/rtl8723bs/hal/odm.h | 62 ++
 2 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/odm.c 
b/drivers/staging/rtl8723bs/hal/odm.c
index 49d552105a65..1ede10f0b9da 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -279,80 +279,12 @@ u32 TxScalingTable_Jaguar[TXSCALE_TABLE_SIZE] = {
0x3FE  /*  36, +6.0dB */
 };
 
-/*  Local Function predefine. */
-
-/* STARTCOMMON INFO RELATED--- */
-void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm);
-
-void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm);
-
-void odm_CmnInfoInit_Debug(struct dm_odm_t *pDM_Odm);
-
-void odm_BasicDbgMessage(struct dm_odm_t *pDM_Odm);
-
-/* ENDCOMMON INFO RELATED--- */
-
-/* START---DIG--- */
-
-/* Remove by Yuchen */
-
-/* END---DIG--- */
-
-/* START---BB POWER SAVE--- */
-/* Remove BB power Saving by YuChen */
-/* END-BB POWER SAVE--- */
-
-void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm);
-
-/* Remove by YuChen */
-
-void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm);
-
-void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm);
-
-void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm);
-
-void odm_SwAntDetectInit(struct dm_odm_t *pDM_Odm);
-
-void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
-
-
-
-void odm_GlobalAdapterCheck(void);
-
-void odm_RefreshRateAdaptiveMask(struct dm_odm_t *pDM_Odm);
-
-void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm);
-
-void odm_RateAdaptiveMaskInit(struct dm_odm_t *pDM_Odm);
-
-
-void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm);
-
 /* Remove Edca by Yu Chen */
 
 
 #define

[PATCH 03/11] staging: rtl8723bs: moved function prototype out of core/rtw_ioctl_set.c and core/rtw_mlme.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
40: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:40:
+u8 rtw_do_join(struct adapter *padapter);

WARNING: externs should be avoided in .c files
15: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:15:
+extern u8 rtw_do_join(struct adapter *padapter);

moved function prototype in include/rtw_ioctl_set.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c| 1 -
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 --
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index cb14855742f7..7d858cae2395 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -37,7 +37,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
return ret;
 }
 
-u8 rtw_do_join(struct adapter *padapter);
 u8 rtw_do_join(struct adapter *padapter)
 {
struct list_head*plist, *phead;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 95cfef118a94..1ee86ec2dee7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -12,8 +12,6 @@
 #include 
 #include 
 
-extern u8 rtw_do_join(struct adapter *padapter);
-
 intrtw_init_mlme_priv(struct adapter *padapter)
 {
int i;
diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h 
b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
index 4b929b84040a..55722c1366aa 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
@@ -28,6 +28,8 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 
*bssid, struct ndis_802_1
 u8 rtw_validate_bssid(u8 *bssid);
 u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
 
+u8 rtw_do_join(struct adapter *padapter);
+
 u16 rtw_get_cur_max_rate(struct adapter *adapter);
 
 #endif
-- 
2.20.1

[PATCH 06/11] staging: rtl8723bs: move function prototype out of core/rtw_recv.c

[Fabio Aiuto]

move function prototype in include/rtw_recv.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c| 1 -
 drivers/staging/rtl8723bs/include/rtw_recv.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index e2a6afed723c..99dede774b7a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1983,7 +1983,6 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl 
*preorder_ctrl, union rec
 
 }
 
-u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq);
 u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq)
 {
if (current_seq < prev_seq)
diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h 
b/drivers/staging/rtl8723bs/include/rtw_recv.h
index 248e098726fd..1dca18040b98 100644
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -553,6 +553,8 @@ int check_indicate_seq(struct recv_reorder_ctrl 
*preorder_ctrl, u16 seq_num);
 
 int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union 
recv_frame *prframe);
 
+u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq);
+
 int recv_indicatepkts_in_order(struct adapter *padapter, struct 
recv_reorder_ctrl *preorder_ctrl,
   int bforced);
 
-- 
2.20.1

[PATCH 09/11] staging: rtl8723bs: move function prototypes out of os_dep/int_fs.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
196: FILE: drivers/staging/rtl8723bs/os_dep/os_intfs.c:196:
+int _netdev_open(struct net_device *pnetdev);
--
WARNING: externs should be avoided in .c files
197: FILE: drivers/staging/rtl8723bs/os_dep/os_intfs.c:197:
+int netdev_open(struct net_device *pnetdev);

moved function prototypes in include/osdep_intf.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/include/osdep_intf.h | 3 +++
 drivers/staging/rtl8723bs/os_dep/os_intfs.c| 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h 
b/drivers/staging/rtl8723bs/include/osdep_intf.h
index 5ad85416c598..dc279ceb1469 100644
--- a/drivers/staging/rtl8723bs/include/osdep_intf.h
+++ b/drivers/staging/rtl8723bs/include/osdep_intf.h
@@ -69,4 +69,7 @@ void rtw_ndev_destructor(struct net_device *ndev);
 int rtw_suspend_common(struct adapter *padapter);
 int rtw_resume_common(struct adapter *padapter);
 
+int _netdev_open(struct net_device *pnetdev);
+int netdev_open(struct net_device *pnetdev);
+
 #endif /* _OSDEP_INTF_H_ */
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c 
b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 9ae7d46fb501..3713c62a477c 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -193,8 +193,6 @@ MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 
1:Enable, 2: Depend on efuse
 module_param(rtw_tx_pwr_by_rate, int, 0644);
 MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on 
efuse");
 
-int _netdev_open(struct net_device *pnetdev);
-int netdev_open(struct net_device *pnetdev);
 static int netdev_close(struct net_device *pnetdev);
 
 static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
-- 
2.20.1

[PATCH 04/11] staging: rtl8723bs: moved function prototypes out of core/rtw_recv.c

[Fabio Aiuto]

fix the following checkpatch issues:

WARNING: externs should be avoided in .c files
1190: FILE: drivers/staging/rtl8723bs/core/rtw_recv.c:1190:
+signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame 
*precv_frame);

and then moved all function prototypes but one in include/rtw_recv.h

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_recv.c| 31 +---
 drivers/staging/rtl8723bs/include/rtw_recv.h | 51 
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 1fa381663b4c..9ef2408ded57 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -305,7 +305,6 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue)
 
 }
 
-signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame 
*precvframe);
 signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame 
*precvframe)
 {
 
@@ -435,8 +434,6 @@ signed int recvframe_chkmic(struct adapter *adapter,  union 
recv_frame *precvfra
 
 }
 
-/* decrypt and set the ivlen, icvlen of the recv_frame */
-union recv_frame *decryptor(struct adapter *padapter, union recv_frame 
*precv_frame);
 union recv_frame *decryptor(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
 
@@ -527,8 +524,6 @@ union recv_frame *decryptor(struct adapter *padapter, union 
recv_frame *precv_fr
return return_packet;
 }
 
-/* set the security information in the recv_frame */
-union recv_frame *portctrl(struct adapter *adapter, union recv_frame 
*precv_frame);
 union recv_frame *portctrl(struct adapter *adapter, union recv_frame 
*precv_frame)
 {
u8 *psta_addr = NULL;
@@ -606,7 +601,6 @@ union recv_frame *portctrl(struct adapter *adapter, union 
recv_frame *precv_fram
return prtnframe;
 }
 
-signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct 
stainfo_rxcache *prxcache);
 signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct 
stainfo_rxcache *prxcache)
 {
signed int tid = precv_frame->u.hdr.attrib.priority;
@@ -634,7 +628,6 @@ signed int recv_decache(union recv_frame *precv_frame, u8 
bretry, struct stainfo
 
 }
 
-void process_pwrbit_data(struct adapter *padapter, union recv_frame 
*precv_frame);
 void process_pwrbit_data(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
unsigned char pwrbit;
@@ -671,7 +664,6 @@ void process_pwrbit_data(struct adapter *padapter, union 
recv_frame *precv_frame
}
 }
 
-void process_wmmps_data(struct adapter *padapter, union recv_frame 
*precv_frame);
 void process_wmmps_data(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -723,7 +715,6 @@ void process_wmmps_data(struct adapter *padapter, union 
recv_frame *precv_frame)
}
 }
 
-void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, 
struct sta_info *sta);
 void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, 
struct sta_info *sta)
 {
int sz;
@@ -755,8 +746,6 @@ void count_rx_stats(struct adapter *padapter, union 
recv_frame *prframe, struct
traffic_check_for_leave_lps(padapter, false, 0);
 }
 
-signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
-   struct sta_info **psta);
 signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
struct sta_info **psta)
 {
@@ -850,8 +839,6 @@ signed int sta2sta_data_frame(struct adapter *adapter, 
union recv_frame *precv_f
return ret;
 }
 
-signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
-  struct sta_info **psta);
 signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
   struct sta_info **psta)
 {
@@ -992,8 +979,6 @@ signed int ap2sta_data_frame(struct adapter *adapter, union 
recv_frame *precv_fr
return ret;
 }
 
-signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
-  struct sta_info **psta);
 signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame 
*precv_frame,
   struct sta_info **psta)
 {
@@ -1049,7 +1034,6 @@ signed int sta2ap_data_frame(struct adapter *adapter, 
union recv_frame *precv_fr
return ret;
 }
 
-signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame 
*precv_frame);
 signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame 
*precv_frame)
 {
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -1186,8 +1170,6 @@ signed int validate_recv_ctrl_frame(struct adapter 
*padapter, union recv_frame *
 
 }
 
-union recv_frame *recvframe_chk_defrag(struct adapter *padapter, 

[PATCH 11/11] staging: rtl8723bs: remove unnecessary extern in os_dep/sdio_intf.c

[Fabio Aiuto]

remove unnecessary extern.

The function is defined static in os_dep/os_intfs.c and used only once
in the same file

remove also a blank line

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c  | 1 -
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c 
b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 3713c62a477c..321f7c45ed95 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1027,7 +1027,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_deinit(padapter);
 }
 
-
 static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
 {
int status = -1;
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 185919b6963f..156ad91d33ee 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -482,8 +482,6 @@ static void rtw_dev_remove(struct sdio_func *func)
RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("-rtw_dev_remove\n"));
 }
 
-extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
-
 static int rtw_sdio_suspend(struct device *dev)
 {
struct sdio_func *func = dev_to_sdio_func(dev);
-- 
2.20.1

Re: [PATCH 05/11] staging: rtl8723bs: remove argument in recv_indicatepkts_pkt_loss_cnt

[Fabio Aiuto]

On Mon, Mar 22, 2021 at 05:11:13PM +0100, Greg KH wrote:
> On Mon, Mar 22, 2021 at 03:31:43PM +0100, Fabio Aiuto wrote:
> > remove debug_priv argument so function prototype can be
> > easily moved away
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_recv.c | 11 ++-
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c 
> > b/drivers/staging/rtl8723bs/core/rtw_recv.c
> > index 9ef2408ded57..e2a6afed723c 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
> > @@ -1983,13 +1983,13 @@ int enqueue_reorder_recvframe(struct 
> > recv_reorder_ctrl *preorder_ctrl, union rec
> >  
> >  }
> >  
> > -void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 
> > prev_seq, u64 current_seq);
> > -void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 
> > prev_seq, u64 current_seq)
> > +u64 recv_indicatepkts_pkt_loss_cnt(u64 prev_seq, u64 current_seq);
> 
> But you did not drop the function prototype, why keep it?
> 
> And shouldn't this be static?
> 
> thanks,
> 
> greg k-h

I moved it in a header file in the next patch [6/11]. However is better a
static function when possible and drop the prototype.

Re: [PATCH 02/11] staging: rtl8723bs: moved function prototypes out of core/rtw_efuse.c

[Fabio Aiuto]

On Mon, Mar 22, 2021 at 05:07:53PM +0100, Greg KH wrote:
> On Mon, Mar 22, 2021 at 03:31:40PM +0100, Fabio Aiuto wrote:
> > fix the following checkpatch issues:
> > 
> > WARNING: externs should be avoided in .c files
> > 35: FILE: drivers/staging/rtl8723bs/core/rtw_efuse.c:35:
> > +bool
> > 
> > moved two function prototypes in include/rtw_efuse.h
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_efuse.c| 10 --
> >  drivers/staging/rtl8723bs/include/rtw_efuse.h |  3 +++
> >  2 files changed, 3 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c 
> > b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> > index 32ca10f01413..0772397738d4 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c
> > @@ -32,11 +32,6 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN] = {0};
> >  #define REG_EFUSE_CTRL 0x0030
> >  #define EFUSE_CTRL REG_EFUSE_CTRL  /*  E-Fuse 
> > Control. */
> >  
> > -bool
> > -Efuse_Read1ByteFromFakeContent(
> > -   struct adapter *padapter,
> > -   u16 Offset,
> > -   u8 *Value);
> >  bool
> >  Efuse_Read1ByteFromFakeContent(
> > struct adapter *padapter,
> > @@ -53,11 +48,6 @@ Efuse_Read1ByteFromFakeContent(
> > return true;
> >  }
> >  
> > -bool
> > -Efuse_Write1ByteToFakeContent(
> > -   struct adapter *padapter,
> > -   u16 Offset,
> > -   u8 Value);
> >  bool
> >  Efuse_Write1ByteToFakeContent(
> > struct adapter *padapter,
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_efuse.h 
> > b/drivers/staging/rtl8723bs/include/rtw_efuse.h
> > index 5bae46ecd9de..1f304df8c421 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_efuse.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_efuse.h
> > @@ -103,6 +103,9 @@ extern u8 fakeBTEfuseInitMap[];
> >  extern u8 fakeBTEfuseModifiedMap[];
> >  /*Export global 
> > variable*/
> >  
> > +bool Efuse_Read1ByteFromFakeContent(struct adapter *padapter, u16 Offset, 
> > u8 *Value);
> > +bool Efuse_Write1ByteToFakeContent(struct adapter *padapter, u16 Offset, 
> > u8 Value);
> 
> No, there's no need for this to be in a .h file, it is only called from
> one .c file.
> 
> Make the thing static and all should be fine, right?
> 
> thanks,
> 
> greg k-h

ok, better static function when possibile. 

Thank you Greg,

fabio

Re: [PATCH 03/11] staging: rtl8723bs: moved function prototype out of core/rtw_ioctl_set.c and core/rtw_mlme.c

[Fabio Aiuto]

On Mon, Mar 22, 2021 at 05:09:00PM +0100, Greg KH wrote:
> On Mon, Mar 22, 2021 at 03:31:41PM +0100, Fabio Aiuto wrote:
> > fix the following checkpatch issues:
> > 
> > WARNING: externs should be avoided in .c files
> > 40: FILE: drivers/staging/rtl8723bs/core/rtw_ioctl_set.c:40:
> > +u8 rtw_do_join(struct adapter *padapter);
> > 
> > WARNING: externs should be avoided in .c files
> > 15: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:15:
> > +extern u8 rtw_do_join(struct adapter *padapter);
> > 
> > moved function prototype in include/rtw_ioctl_set.h
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/core/rtw_ioctl_set.c| 1 -
> >  drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 --
> >  drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 ++
> >  3 files changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
> > b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
> > index cb14855742f7..7d858cae2395 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
> > @@ -37,7 +37,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
> > return ret;
> >  }
> >  
> > -u8 rtw_do_join(struct adapter *padapter);
> >  u8 rtw_do_join(struct adapter *padapter)
> >  {
> > struct list_head*plist, *phead;
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
> > b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > index 95cfef118a94..1ee86ec2dee7 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > @@ -12,8 +12,6 @@
> >  #include 
> >  #include 
> >  
> > -extern u8 rtw_do_join(struct adapter *padapter);
> > -
> >  intrtw_init_mlme_priv(struct adapter *padapter)
> >  {
> > int i;
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h 
> > b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
> > index 4b929b84040a..55722c1366aa 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
> > @@ -28,6 +28,8 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 
> > *bssid, struct ndis_802_1
> >  u8 rtw_validate_bssid(u8 *bssid);
> >  u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
> >  
> > +u8 rtw_do_join(struct adapter *padapter);
> > +
> 
> This is already in drivers/staging/rtl8188eu/include/hal_intf.h, why
> declare it again?

I didn't check the rtl8188eu for that's not a module rtl8723bs depends on

> I'm stopping here on reviewing this patchset, please look closer at it
> again and fix up and resend a v2.
> 
> thanks,
> 
> greg k-h

Ok, I will fix everything and send you a patchset v2

Re: [PATCH 05/15] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_PM

[Fabio Aiuto]

On Tue, Mar 16, 2021 at 12:39:19PM +0100, Greg KH wrote:
> On Mon, Mar 15, 2021 at 11:15:02AM +0100, Fabio Aiuto wrote:
> > remove conditional code blocks checked by unused CONFIG_PM
> > 
> > cleaning required in TODO file:
> > 
> > find and remove code blocks guarded by never set CONFIG_FOO defines
> > 
> > Signed-off-by: Fabio Aiuto 
> > ---
> >  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 
> >  1 file changed, 8 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
> > b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> > index 2ff71d001c07..5748e1c1a25c 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> > @@ -3198,14 +3198,6 @@ static void rtw_cfg80211_preinit_wiphy(struct 
> > adapter *padapter, struct wiphy *w
> > wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
> > wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
> >  
> > -#if defined(CONFIG_PM)
> > -   wiphy->max_sched_scan_reqs = 1;
> > -#endif
> > -
> > -#if defined(CONFIG_PM)
> > -   wiphy->wowlan = &wowlan_stub;
> > -#endif
> 
> How this is "unused"?  This is a real config option, did you just change
> the logic here?
> 
> thanks,
> 
> greg k-h

Hi Greg,

ignore this patch. I missed that definition of PM config option.
I dropped it off my own local repo.

Thank you,

fabio

[PATCH v2] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_AP_WOWLAN

[Fabio Aiuto]

remove conditional code blocks checked by unused CONFIG_AP_WOWLAN

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Changes in v2:
rebase of conflicting code with public tree

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c  |  35 --
 .../staging/rtl8723bs/core/rtw_wlan_util.c|  31 --
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c  | 339 --
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  33 --
 drivers/staging/rtl8723bs/hal/sdio_halinit.c  | 105 --
 drivers/staging/rtl8723bs/hal/sdio_ops.c  |  35 --
 .../rtl8723bs/include/drv_types_sdio.h|   5 -
 .../staging/rtl8723bs/include/hal_com_h2c.h   |  30 --
 drivers/staging/rtl8723bs/include/hal_intf.h  |   3 -
 .../staging/rtl8723bs/include/osdep_service.h |   9 +-
 .../staging/rtl8723bs/include/rtl8723b_cmd.h  |   6 -
 .../staging/rtl8723bs/include/rtl8723b_hal.h  |   4 -
 drivers/staging/rtl8723bs/include/rtw_mp.h|   3 -
 drivers/staging/rtl8723bs/include/sdio_ops.h  |   7 -
 .../staging/rtl8723bs/os_dep/ioctl_linux.c|   4 -
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 134 ---
 16 files changed, 1 insertion(+), 782 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c 
b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 2e6c522b74e3..b942cf49cd27 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -350,17 +350,8 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
-#ifdef CONFIG_AP_WOWLAN
-   if (pwrpriv->bInSuspend && pwrpriv->wowlan_mode)
-   return true;
-   else if (pwrpriv->bInSuspend && pwrpriv->wowlan_ap_mode)
-   return true;
-   else if (pwrpriv->bInSuspend)
-   return false;
-#else
if (pwrpriv->bInSuspend)
return false;
-#endif
 
curr_time = jiffies;
 
@@ -391,9 +382,6 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)
 void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 
bcn_ant_mode, const char *msg)
 {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
-#ifdef CONFIG_AP_WOWLAN
-   struct debug_priv *pdbgpriv = &padapter->dvobj->drv_dbg;
-#endif
 
RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
 ("%s: PowerMode =%d Smart_PS =%d\n",
@@ -422,29 +410,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, 
u8 smart_ps, u8 bcn_a
pwrpriv->pwr_mode = ps_mode;
rtw_set_rpwm(padapter, PS_STATE_S4);
 
-#ifdef CONFIG_AP_WOWLAN
-   if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode) {
-   unsigned long start_time;
-   u32 delay_ms;
-   u8 val8;
-   delay_ms = 20;
-   start_time = jiffies;
-   do {
-   rtw_hal_get_hwreg(padapter, 
HW_VAR_SYS_CLKR, &val8);
-   if (!(val8 & BIT(4))) { /* 0x08 bit4 = 
1 --> in 32k, bit4 = 0 --> leave 32k */
-   pwrpriv->cpwm = PS_STATE_S4;
-   break;
-   }
-   if (jiffies_to_msecs(jiffies - 
start_time) > delay_ms) {
-   DBG_871X("%s: Wait for FW 32K 
leave more than %u ms!!!\n",
-   __func__, 
delay_ms);
-   
pdbgpriv->dbg_wow_leave_ps_fail_cnt++;
-   break;
-   }
-   msleep(1);
-   } while (1);
-   }
-#endif
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 
*)(&ps_mode));
pwrpriv->bFwCurrentInPSMode = false;
 
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 355e43c4cf9a..d04514d36b49 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -10,10 +10,6 @@
 #include 
 #include 
 
-#ifdef CONFIG_AP_WOWLAN
-#include 
-#endif
-
 static unsigned char ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f};
 static unsigned char ARTHEROS_OUI2[] = {0x00, 0x13, 0x74};
 
@@ -2113,30 +2109,3 @@ int rtw_config_gpio(struct net_device *netdev, int 
gpio_num, bool isOutput)
 EXPORT_SYMBOL(rtw_

[PATCH v2] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_GPIO_API

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_GPIO_API

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Changes in v2:
rebase of conflicting code in public staging-testing

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/core/rtw_wlan_util.c| 95 ---
 drivers/staging/rtl8723bs/include/drv_types.h |  6 --
 .../staging/rtl8723bs/os_dep/ioctl_linux.c| 40 
 3 files changed, 141 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index d04514d36b49..3e211780cde4 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -2014,98 +2014,3 @@ struct adapter *dvobj_get_port0_adapter(struct 
dvobj_priv *dvobj)
 
return dvobj->padapters;
 }
-
-#ifdef CONFIG_GPIO_API
-int rtw_get_gpio(struct net_device *netdev, int gpio_num)
-{
-   u8 value;
-   u8 direction;
-   struct adapter *adapter = rtw_netdev_priv(netdev);
-   struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);
-
-   rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-   DBG_871X("rf_pwrstate = 0x%02x\n", pwrpriv->rf_pwrstate);
-   LeaveAllPowerSaveModeDirect(adapter);
-
-   /* Read GPIO Direction */
-   direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) 
>> gpio_num;
-
-   /* According the direction to read register value */
-   if (direction)
-   value = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) & 
BIT(gpio_num)) >> gpio_num;
-   else
-   value = (rtw_read8(adapter, REG_GPIO_PIN_CTRL) & BIT(gpio_num)) 
>> gpio_num;
-
-   rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-   DBG_871X("%s direction =%d value =%d\n", __func__, direction, value);
-
-   return value;
-}
-EXPORT_SYMBOL(rtw_get_gpio);
-
-int  rtw_set_gpio_output_value(struct net_device *netdev, int gpio_num, bool 
isHigh)
-{
-   u8 direction = 0;
-   u8 res = -1;
-   struct adapter *adapter = rtw_netdev_priv(netdev);
-
-   /* Check GPIO is 4~7 */
-   if (gpio_num > 7 || gpio_num < 4) {
-   DBG_871X("%s The gpio number does not included 4~7.\n", 
__func__);
-   return -1;
-   }
-
-   rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-   LeaveAllPowerSaveModeDirect(adapter);
-
-   /* Read GPIO direction */
-   direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) 
>> gpio_num;
-
-   /* If GPIO is output direction, setting value. */
-   if (direction) {
-   if (isHigh)
-   rtw_write8(adapter, REG_GPIO_PIN_CTRL + 1, 
rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) | BIT(gpio_num));
-   else
-   rtw_write8(adapter, REG_GPIO_PIN_CTRL + 1, 
rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) & ~BIT(gpio_num));
-
-   DBG_871X("%s Set gpio %x[%d]=%d\n", __func__, 
REG_GPIO_PIN_CTRL+1, gpio_num, isHigh);
-   res = 0;
-   } else {
-   DBG_871X("%s The gpio is input, not be set!\n", __func__);
-   res = -1;
-   }
-
-   rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-   return res;
-}
-EXPORT_SYMBOL(rtw_set_gpio_output_value);
-
-int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput)
-{
-   struct adapter *adapter = rtw_netdev_priv(netdev);
-
-   if (gpio_num > 7 || gpio_num < 4) {
-   DBG_871X("%s The gpio number does not included 4~7.\n", 
__func__);
-   return -1;
-   }
-
-   DBG_871X("%s gpio_num =%d direction =%d\n", __func__, gpio_num, 
isOutput);
-
-   rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-   LeaveAllPowerSaveModeDirect(adapter);
-
-   if (isOutput)
-   rtw_write8(adapter, REG_GPIO_PIN_CTRL + 2, rtw_read8(adapter, 
REG_GPIO_PIN_CTRL + 2) | BIT(gpio_num));
-   else
-   rtw_write8(adapter, REG_GPIO_PIN_CTRL + 2, rtw_read8(adapter, 
REG_GPIO_PIN_CTRL + 2) & ~BIT(gpio_num));
-
-   rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-
-   return 0;
-}
-EXPORT_SYMBOL(rtw_config_gpio);
-#endif
-
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h 
b/drivers/staging/rtl8723bs/include/drv_types.h
index 9d482a6115ab..9c0e7b6946f8 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -528,12 +528,6 @@ static inline void RTW_ENABLE_FUNC(struct adapter 
*padapter, int func_bit)
 (padapter)->bSurpriseRemoved || \
 RTW_IS_FUNC_DISABLED((padapter), DF_TX_BIT))
 
-#ifdef CONFIG_GPIO_API
-int rtw_get_gpio(struct net_device *netdev, int gpio_num);
-int rtw_set_gpio_output_value(struct net_device *netdev, int gpio_num, bool 
isHigh);
-int rtw_config_gpi

[PATCH 00/12] Remove more unused code blocks

[Fabio Aiuto]

Remove unused code clocks, as required in TODO list:

find and remove code blocks guarded by never set CONFIG_FOO defines

Fabio Aiuto (12):
  staging: rtl8723bs: remove unused code blocks
conditioned by never set CONFIG_CMCC_TEST
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_INTERRUPT_BASED_TXBCN*
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_DISABLE_MCS13TO15
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_VALIDATE_SSID
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_LAYER2_ROAMING_ACTIVE
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_USB_VENDOR*
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_SINGLE_RECV_BUF
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_RX_INDICATE_QUEUE
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_BSD_RX_USE_MBUF
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_R871X_TEST
  staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_MULTI_VIR_IFACES

 drivers/staging/rtl8723bs/core/rtw_ap.c   | 30 ++
 .../staging/rtl8723bs/core/rtw_ioctl_set.c| 11 -
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 19 +
 .../staging/rtl8723bs/core/rtw_wlan_util.c| 15 ---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 ---
 drivers/staging/rtl8723bs/include/drv_conf.h  | 10 -
 drivers/staging/rtl8723bs/include/drv_types.h |  3 --
 .../staging/rtl8723bs/include/osdep_intf.h|  6 ---
 drivers/staging/rtl8723bs/include/rtw_recv.h  | 17 +---
 9 files changed, 6 insertions(+), 145 deletions(-)

-- 
2.20.1

[PATCH 01/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_CMCC_TEST

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 6f08af686f9d..5904b7f9f134 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2115,16 +2115,6 @@ static void UpdateHalRAMask8723B(struct adapter 
*padapter, u32 mac_id, u8 rssi_l
rate_bitmap = hal_btcoex_GetRaMask(padapter);
mask &= ~rate_bitmap;
 
-#ifdef CONFIG_CMCC_TEST
-   if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {
-   if (mac_id == 0) {
-   DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", 
mask);
-   mask &= 0xff00; /* disable CCK & <24M OFDM rate for 
11G mode for CMCC */
-   DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", 
mask);
-   }
-   }
-#endif
-
if (pHalData->fw_ractrl) {
rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, 
psta->bw_mode, shortGIrate, mask);
}
@@ -3082,10 +3072,6 @@ static void rtl8723b_fill_default_txdesc(
ptxdesc->data_ldpc = 1;
if (pattrib->stbc)
ptxdesc->data_stbc = 1;
-
-#ifdef CONFIG_CMCC_TEST
-   ptxdesc->data_short = 1; /* use cck short premble */
-#endif
} else {
/*  EAP data packet and ARP packet. */
/*  Use the 1M data rate to send the EAP/ARP packet. */
@@ -3767,11 +3753,6 @@ void SetHwReg8723B(struct adapter *padapter, u8 
variable, u8 *val)
BrateCfg &= rrsr_2g_allow_mask;
masked = BrateCfg;
 
-   #ifdef CONFIG_CMCC_TEST
-   BrateCfg |= (RRSR_11M|RRSR_5_5M|RRSR_1M); /* use 11M to send 
ACK */
-   BrateCfg |= (RRSR_24M|RRSR_18M|RRSR_12M); /* CMCC_OFDM_ACK 
12/18/24M */
-   #endif
-
/* IOT consideration */
if (mlmext_info->assoc_AP_vendor == HT_IOT_PEER_CISCO) {
/* if peer is cisco and didn't use ofdm rate, we enable 
6M ack */
-- 
2.20.1

[PATCH 03/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_DISABLE_MCS13TO15

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_DISABLE_MCS13TO15

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c  | 16 +---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c |  7 ---
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 725f699abda9..a9e5c27a42f7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2679,14 +2679,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter 
*padapter, u8 *in_ie, u8 *out_
if (stbc_rx_enable)
ht_capie.cap_info |= 
cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_2R);/* RX STBC two spatial stream */
 
-   #ifdef CONFIG_DISABLE_MCS13TO15
-   if (((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) 
&& (pregistrypriv->wifi_spec != 1))
-   set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, 
MCS_RATE_2R_13TO15_OFF);
-   else
-   set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, 
MCS_RATE_2R);
-   #else /* CONFIG_DISABLE_MCS13TO15 */
-   set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
-   #endif /* CONFIG_DISABLE_MCS13TO15 */
+   set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);
break;
}
 
@@ -2809,14 +2802,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 
*pie, uint ie_len, u8 channe
break;
case RF_2T2R:
default:
-#ifdef CONFIG_DISABLE_MCS13TO15
-   if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && 
pregistrypriv->wifi_spec != 1)
-   
set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, 
MCS_RATE_2R_13TO15_OFF);
-   else
-   
set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#else /* CONFIG_DISABLE_MCS13TO15 */

set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#endif /* CONFIG_DISABLE_MCS13TO15 */
}
 
/* switch to the 40M Hz mode according to the AP */
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 3e211780cde4..2dd902b04509 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1071,14 +1071,7 @@ void HT_caps_handler(struct adapter *padapter, struct 
ndis_80211_var_ie *pIE)
break;
case RF_2T2R:
default:
-#ifdef CONFIG_DISABLE_MCS13TO15
-   if (pmlmeext->cur_bwmode == CHANNEL_WIDTH_40 && 
pregistrypriv->wifi_spec != 1)
-   
set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, 
MCS_RATE_2R_13TO15_OFF);
-   else
-   
set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#else /* CONFIG_DISABLE_MCS13TO15 */

set_mcs_rate_by_mask(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_RATE_2R);
-#endif /* CONFIG_DISABLE_MCS13TO15 */
}
 
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
-- 
2.20.1

[PATCH 02/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_INTERRUPT_BASED_TXBCN*

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_INTERRUPT_BASED_TXBCN family defines

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ap.c   | 30 ++-
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 21 -
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c 
b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 63b339484289..74f0f4d5a0b3 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -920,12 +920,10 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf)
if (pmlmeext->bstart_bss) {
update_beacon(padapter, WLAN_EID_TIM, NULL, true);
 
-#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will  tx beacon when bcn 
interrupt coming in. */
-   /* issue beacon frame */
-   if (send_beacon(padapter) == _FAIL)
-   DBG_871X("issue_beacon, fail!\n");
+   /* issue beacon frame */
+   if (send_beacon(padapter) == _FAIL)
+   DBG_871X("issue_beacon, fail!\n");
 
-#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
}
 
/* update bc/mc sta_info */
@@ -1685,26 +1683,6 @@ static void update_bcn_wps_ie(struct adapter *padapter)
}
 
kfree(pbackup_remainder_ie);
-
-   /*  deal with the case without set_tx_beacon_cmd() in update_beacon() */
-#if defined(CONFIG_INTERRUPT_BASED_TXBCN)
-   if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
-   u8 sr = 0;
-
-   rtw_get_wps_attr_content(
-   pwps_ie_src,
-   wps_ielen,
-   WPS_ATTR_SELECTED_REGISTRAR,
-   (u8 *)(&sr),
-   NULL
-   );
-
-   if (sr) {
-   set_fwstate(pmlmepriv, WIFI_UNDER_WPS);
-   DBG_871X("%s, set WIFI_UNDER_WPS\n", __func__);
-   }
-   }
-#endif
 }
 
 static void update_bcn_p2p_ie(struct adapter *padapter)
@@ -1802,12 +1780,10 @@ void update_beacon(struct adapter *padapter, u8 ie_id, 
u8 *oui, u8 tx)
 
spin_unlock_bh(&pmlmepriv->bcn_update_lock);
 
-#ifndef CONFIG_INTERRUPT_BASED_TXBCN
if (tx) {
/* send_beacon(padapter);//send_beacon must execute on TSR 
level */
set_tx_beacon_cmd(padapter);
}
-#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 }
 
 /*
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c 
b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 5904b7f9f134..2b81be6f1b32 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -3272,17 +3272,6 @@ static void hw_var_set_opmode(struct adapter *padapter, 
u8 variable, u8 *val)
if ((mode == _HW_STATE_STATION_) || (mode == 
_HW_STATE_NOLINK_)) {
{
StopTxBeacon(padapter);
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
-   rtw_write8(padapter, REG_DRVERLYINT, 0x05); /*  
restore early int time to 5ms */
-   UpdateInterruptMask8812AU(padapter, true, 0, 
IMR_BCNDMAINT0_8723B);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */
-
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
-   UpdateInterruptMask8812AU(padapter, true, 0, 
(IMR_TXBCN0ERR_8723B|IMR_TXBCN0OK_8723B));
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */
-
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN */
}
 
/*  disable atim wnd */
@@ -3292,16 +3281,6 @@ static void hw_var_set_opmode(struct adapter *padapter, 
u8 variable, u8 *val)
ResumeTxBeacon(padapter);
rtw_write8(padapter, REG_BCN_CTRL, 
DIS_TSF_UDT|EN_BCN_FUNCTION|DIS_BCNQ_SUB);
} else if (mode == _HW_STATE_AP_) {
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT
-   UpdateInterruptMask8723BU(padapter, true, 
IMR_BCNDMAINT0_8723B, 0);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_EARLY_INT */
-
-#ifdef CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR
-   UpdateInterruptMask8723BU(padapter, true, 
(IMR_TXBCN0ERR_8723B|IMR_TXBCN0OK_8723B), 0);
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN_BCN_OK_ERR */
-
-#endif /*  CONFIG_INTERRUPT_BASED_TXBCN */
 
ResumeTxBeacon(padapter);
 
-- 
2.20.1

[PATCH 04/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 
 1 file changed, 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c 
b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 2dd902b04509..ea690dbbfebb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1809,15 +1809,7 @@ void process_addba_req(struct adapter *padapter, u8 
*paddba_req, u8 *addr)
 
preorder_ctrl = &psta->recvreorder_ctrl[tid];
 
-   #ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ
-   preorder_ctrl->indicate_seq = start_seq;
-   #ifdef DBG_RX_SEQ
-   DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", 
__func__, __LINE__,
-   preorder_ctrl->indicate_seq, start_seq);
-   #endif
-   #else
preorder_ctrl->indicate_seq = 0x;
-   #endif
 
preorder_ctrl->enable = pmlmeinfo->accept_addba_req;
}
-- 
2.20.1

[PATCH 05/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_VALIDATE_SSID

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_VALIDATE_SSID

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index c9418bfb2a00..5929a7bf7db6 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -33,17 +33,6 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
goto exit;
}
 
-#ifdef CONFIG_VALIDATE_SSID
-   for (i = 0; i < ssid->SsidLength; i++) {
-   /* wifi, printable ascii code must be supported */
-   if (!((ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e))) {
-   RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, 
("ssid has non-printable ascii\n"));
-   ret = false;
-   break;
-   }
-   }
-#endif /* CONFIG_VALIDATE_SSID */
-
 exit:
return ret;
 }
-- 
2.20.1

[PATCH 06/12] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_LAYER2_ROAMING_ACTIVE

[Fabio Aiuto]

remove conditional code blocks checked by unused
CONFIG_LAYER2_ROAMING_ACTIVE

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto 
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c 
b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index a9e5c27a42f7..149093c710ae 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -67,9 +67,6 @@ int   rtw_init_mlme_priv(struct adapter *padapter)
pmlmepriv->roam_flags = 0
| RTW_ROAM_ON_EXPIRED
| RTW_ROAM_ON_RESUME
-   #ifdef CONFIG_LAYER2_ROAMING_ACTIVE /* FIXME */
-   | RTW_ROAM_ACTIVE
-   #endif
;
 
pmlmepriv->roam_scanr_exp_ms = RTW_ROAM_SCAN_RESULT_EXP_MS;
-- 
2.20.1