staging: rtl8723au: Get rid of NDEV_FMT/NDEV_ARG macros

Silly use-once macros that simply obfuscates the code.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index f514dd335881b474f8cb00b879665c3fb5591204..67887bcdaec3a2306107ab7d4dbc8f93c99fecd4 100644 (file)
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -137,8 +137,6 @@ extern unsigned char        MCS_rate_1R23A[16];
 void   _rtw_init_queue23a(struct rtw_queue *pqueue);
 
 
-#define NDEV_FMT "%s"
-#define NDEV_ARG(ndev) ndev->name
 #define ADPT_FMT "%s"
 #define ADPT_ARG(adapter) adapter->pnetdev->name
 #define FUNC_NDEV_FMT "%s(%s)"

diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index ca100dcc27631dc0796101f78b30a784bf03f69d..efdb48dfbb4d468f8371a4bd1e6ae3626226df11 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -2558,9 +2558,8 @@ static int rtw_cfg80211_add_monitor_if(struct rtw_adapter *padapter, char *name,
        }
 
        if (pwdev_priv->pmon_ndev) {
-               DBG_8723A(FUNC_ADPT_FMT " monitor interface exist: " NDEV_FMT
-                         "\n", FUNC_ADPT_ARG(padapter),
-                         NDEV_ARG(pwdev_priv->pmon_ndev));
+               DBG_8723A(FUNC_ADPT_FMT " monitor interface exist: %s\n",
+                         FUNC_ADPT_ARG(padapter), pwdev_priv->pmon_ndev->name);
                ret = -EBUSY;
                goto out;
        }