Skip to content

remove DBG_871X_LEVEL macro

Fabio Aiuto linux-staging lkml 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6staging: rtl8723bs: replace DBG_871X_LEVEL logs with netdev_*()drivers/staging/rtl8723bs/core/rtw_cmd.c drivers/staging/rtl8723bs/core/rtw_io.c drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +14 more+178 -1080 replies
2/6staging: rtl8723bs: fix code indent issuedrivers/staging/rtl8723bs/os_dep/os_intfs.c+2 -20 replies
3/6staging: rtl8723bs: fix indentation in if blockdrivers/staging/rtl8723bs/core/rtw_mlme_ext.c+4 -40 replies
4/6staging: rtl8723bs: split too long linedrivers/staging/rtl8723bs/core/rtw_mlme_ext.c+2 -10 replies
5/6staging: rtl8723bs: remove unused DBG_871X_LEVEL macro declarationsdrivers/staging/rtl8723bs/include/rtw_debug.h+0 -140 replies
6/6staging: rtl8723bs: remove empty #ifdef blockdrivers/staging/rtl8723bs/os_dep/sdio_intf.c+0 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/6] remove DBG_871X_LEVEL macro

This patchset removes DBG_871X_LEVEL macro.

It does a raw printk so replace it with the more
recommended netdev_*() functions.

Removal and replacement is done with the following semantic patch:

@@
expression list args;
identifier padapter;
identifier func;
symbol _drv_always_, _drv_info_, _drv_warning_;
symbol _drv_err_, _drv_emerg_;
@@

func(..., struct adapter *padapter, ...) {
	<...

(
- DBG_871X_LEVEL(_drv_always_, args);
+ netdev_dbg(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_info_, args);
+ netdev_info(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_warning_, args);
+ netdev_warn(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_err_, args);
+ netdev_err(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_emerg_, args);
+ netdev_emerg(padapter->pnetdev, args);
)

	...>
}

@rule@
identifier func, context, padapter;
@@

func(void *context)

{
	...
struct adapter *padapter = context;
	...
}

@@
expression list args;
identifier rule.padapter;
identifier rule.func, rule.context;
@@

func(void *context)

{
	<...

(
- DBG_871X_LEVEL(_drv_always_, args);
+ netdev_dbg(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_info_, args);
+ netdev_info(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_warning_, args);
+ netdev_warn(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_err_, args);
+ netdev_err(padapter->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_emerg_, args);
+ netdev_emerg(padapter->pnetdev, args);
)

	...>
}

@@
expression list args;
expression get_dev;
identifier func, dev;
@@

func(...)

{
	...
	struct net_device *dev = get_dev;
	<...

(
- DBG_871X_LEVEL(_drv_always_, args);
+ netdev_dbg(dev, args);
|
- DBG_871X_LEVEL(_drv_info_, args);
+ netdev_info(dev, args);
|
- DBG_871X_LEVEL(_drv_warning_, args);
+ netdev_warn(dev, args);
|
- DBG_871X_LEVEL(_drv_err_, args);
+ netdev_err(dev, args);
|
- DBG_871X_LEVEL(_drv_emerg_, args);
+ netdev_emerg(dev, args);
)

	...>
}

@@
expression list args;
identifier func, dev;
@@

func(struct net_device *dev)

{
	<...

(
- DBG_871X_LEVEL(_drv_always_, args);
+ netdev_dbg(dev, args);
|
- DBG_871X_LEVEL(_drv_info_, args);
+ netdev_info(dev, args);
|
- DBG_871X_LEVEL(_drv_warning_, args);
+ netdev_warn(dev, args);
|
- DBG_871X_LEVEL(_drv_err_, args);
+ netdev_err(dev, args);
|
- DBG_871X_LEVEL(_drv_emerg_, args);
+ netdev_emerg(dev, args);
)

	...>
}

@@
expression list args;
identifier func, dvobj;
@@

func(struct dvobj_priv *dvobj)

{
	<...

(
- DBG_871X_LEVEL(_drv_always_, args);
+ netdev_dbg(dvobj->if1->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_info_, args);
+ netdev_info(dvobj->if1->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_warning_, args);
+ netdev_warn(dvobj->if1->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_err_, args);
+ netdev_err(dvobj->if1->pnetdev, args);
|
- DBG_871X_LEVEL(_drv_emerg_, args);
+ netdev_emerg(dvobj->if1->pnetdev, args);
)

	...>
}

@@
@@

- DBG_871X_LEVEL(...);

Some code cleaning done as well.

Fabio Aiuto (6):
staging: rtl8723bs: replace DBG_871X_LEVEL logs with netdev_*()
staging: rtl8723bs: fix code indent issue
staging: rtl8723bs: fix indentation in if block
staging: rtl8723bs: split too long line
staging: rtl8723bs: remove unused DBG_871X_LEVEL macro declarations
staging: rtl8723bs: remove empty #ifdef block

 drivers/staging/rtl8723bs/core/rtw_cmd.c      | 30 +++++---
 drivers/staging/rtl8723bs/core/rtw_io.c       |  4 +-
 .../staging/rtl8723bs/core/rtw_ioctl_set.c    | 10 +--
 drivers/staging/rtl8723bs/core/rtw_mlme.c     |  3 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 72 ++++++++++++-------
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c  |  9 ++-
 drivers/staging/rtl8723bs/core/rtw_security.c | 40 +++++++----
 .../staging/rtl8723bs/core/rtw_wlan_util.c    | 21 +++---
 drivers/staging/rtl8723bs/core/rtw_xmit.c     |  2 +-
 drivers/staging/rtl8723bs/hal/hal_com.c       | 26 ++++---
 .../staging/rtl8723bs/hal/rtl8723b_hal_init.c |  4 +-
 .../staging/rtl8723bs/hal/rtl8723bs_xmit.c    | 14 ++--
 drivers/staging/rtl8723bs/hal/sdio_ops.c      |  3 +-
 drivers/staging/rtl8723bs/include/rtw_debug.h | 14 ----
 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c |  8 ++-
 .../staging/rtl8723bs/os_dep/ioctl_linux.c    |  2 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 32 +++++----
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c  | 15 +---
 18 files changed, 181 insertions(+), 128 deletions(-)
Signature · 1 line
2.20.1