wil6210: clean ioctl debug message

Fix a debug message related to IOCTL that was incorrectly logged
with the MISC category, and move it inside wil_ioctl so it will
always be logged even if we call wil_ioctl from other places.

Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/wil6210/ioctl.c b/drivers/net/wireless/ath/wil6210/ioctl.c
index f7f9486219516f3d8d713d0377fa574bb5eb1ec9..630380078236db718590da145ea1f56a4188d151 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/ioctl.c
+++ b/drivers/net/wireless/ath/wil6210/ioctl.c
@@ -161,13 +161,20 @@ out_free:
 
 int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd)
 {
+       int ret;
+
        switch (cmd) {
        case WIL_IOCTL_MEMIO:
-               return wil_ioc_memio_dword(wil, data);
+               ret = wil_ioc_memio_dword(wil, data);
+               break;
        case WIL_IOCTL_MEMIO_BLOCK:
-               return wil_ioc_memio_block(wil, data);
+               ret = wil_ioc_memio_block(wil, data);
+               break;
        default:
                wil_dbg_ioctl(wil, "Unsupported IOCTL 0x%04x\n", cmd);
                return -ENOIOCTLCMD;
        }
+
+       wil_dbg_ioctl(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);
+       return ret;
 }

diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index d4ec5b278eb39e4f8d0dd1a0ee23e58f67e54ebd..3bc0e2634db0f2a49eb096f5589f5ddbecfda365 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -60,11 +60,7 @@ static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
 {
        struct wil6210_priv *wil = ndev_to_wil(ndev);
 
-       int ret = wil_ioctl(wil, ifr->ifr_data, cmd);
-
-       wil_dbg_misc(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);
-
-       return ret;
+       return wil_ioctl(wil, ifr->ifr_data, cmd);
 }
 
 static const struct net_device_ops wil_netdev_ops = {