staging: wlan-ng: Replace pr_debug with netdev_dbg

This patch replace pr_debug with netdev_dbg when appropriate net_device
structure is found.
Issue found using the following Coccinelle script:

@r exists@
identifier f, s, i;
position p;
@@

f(...,struct s *i,...) {
<+... when != i == NULL
(
pr_err@p(...);
|
pr_info@p(...);
|
pr_debug@p(...);
)
...+>
}

@rr@
identifier r.s, fld;
@@

struct s {
	...
	struct net_device *fld;
	... };

@@
identifier r.i, r.s, rr.fld;
position r.p;
@@
(
-pr_err@p
+netdev_err
	(
+ i->fld,
...)
|
-pr_info@p
+netdev_info
	(
+ i->fld,
...)
|
-pr_debug@p
+netdev_dbg
	(
+ i->fld,
...)
)

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index c4aa9e7e7003cb669ea9e888791391df588ebeb7..72070593394a331f010f3a846ed878ae7ead0608 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -394,8 +394,9 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
                count = HFA384x_SCANRESULT_MAX;
 
        if (req->bssindex.data >= count) {
-               pr_debug("requested index (%d) out of range (%d)\n",
-                        req->bssindex.data, count);
+               netdev_dbg(wlandev->netdev,
+                          "requested index (%d) out of range (%d)\n",
+                          req->bssindex.data, count);
                result = 2;
                req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
                goto exit;
@@ -684,7 +685,8 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)
 
        goto done;
 failed:
-       pr_debug("Failed to set a config option, result=%d\n", result);
+       netdev_dbg(wlandev->netdev,
+                  "Failed to set a config option, result=%d\n", result);
        msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
 
 done:
@@ -1120,15 +1122,17 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                /* Disable monitor mode */
                result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE);
                if (result) {
-                       pr_debug("failed to disable monitor mode, result=%d\n",
-                                result);
+                       netdev_dbg(wlandev->netdev,
+                                  "failed to disable monitor mode, result=%d\n",
+                                  result);
                        goto failed;
                }
                /* Disable port 0 */
                result = hfa384x_drvr_disable(hw, 0);
                if (result) {
-                       pr_debug
-                       ("failed to disable port 0 after sniffing, result=%d\n",
+                       netdev_dbg
+                       (wlandev->netdev,
+                            "failed to disable port 0 after sniffing, result=%d\n",
                             result);
                        goto failed;
                }
@@ -1140,8 +1144,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                  HFA384x_RID_CNFWEPFLAGS,
                                                  hw->presniff_wepflags);
                if (result) {
-                       pr_debug
-                           ("failed to restore wepflags=0x%04x, result=%d\n",
+                       netdev_dbg
+                           (wlandev->netdev,
+                            "failed to restore wepflags=0x%04x, result=%d\n",
                             hw->presniff_wepflags, result);
                        goto failed;
                }
@@ -1153,8 +1158,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                  HFA384x_RID_CNFPORTTYPE,
                                                  word);
                        if (result) {
-                               pr_debug
-                                   ("failed to restore porttype, result=%d\n",
+                               netdev_dbg
+                                   (wlandev->netdev,
+                                    "failed to restore porttype, result=%d\n",
                                     result);
                                goto failed;
                        }
@@ -1162,8 +1168,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                        /* Enable the port */
                        result = hfa384x_drvr_enable(hw, 0);
                        if (result) {
-                               pr_debug("failed to enable port to presniff setting, result=%d\n",
-                                        result);
+                               netdev_dbg(wlandev->netdev,
+                                          "failed to enable port to presniff setting, result=%d\n",
+                                          result);
                                goto failed;
                        }
                } else {
@@ -1182,8 +1189,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                  HFA384x_RID_CNFPORTTYPE,
                                                  &(hw->presniff_port_type));
                                if (result) {
-                                       pr_debug
-                                       ("failed to read porttype, result=%d\n",
+                                       netdev_dbg
+                                       (wlandev->netdev,
+                                            "failed to read porttype, result=%d\n",
                                             result);
                                        goto failed;
                                }
@@ -1192,24 +1200,27 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                  HFA384x_RID_CNFWEPFLAGS,
                                                  &(hw->presniff_wepflags));
                                if (result) {
-                                       pr_debug
-                                       ("failed to read wepflags, result=%d\n",
+                                       netdev_dbg
+                                       (wlandev->netdev,
+                                            "failed to read wepflags, result=%d\n",
                                             result);
                                        goto failed;
                                }
                                hfa384x_drvr_stop(hw);
                                result = hfa384x_drvr_start(hw);
                                if (result) {
-                                       pr_debug("failed to restart the card for sniffing, result=%d\n",
-                                                result);
+                                       netdev_dbg(wlandev->netdev,
+                                                  "failed to restart the card for sniffing, result=%d\n",
+                                                  result);
                                        goto failed;
                                }
                        } else {
                                /* Disable the port */
                                result = hfa384x_drvr_disable(hw, 0);
                                if (result) {
-                                       pr_debug("failed to enable port for sniffing, result=%d\n",
-                                                result);
+                                       netdev_dbg(wlandev->netdev,
+                                                  "failed to enable port for sniffing, result=%d\n",
+                                                  result);
                                        goto failed;
                                }
                        }
@@ -1225,8 +1236,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                hw->sniff_channel = word;
 
                if (result) {
-                       pr_debug("failed to set channel %d, result=%d\n",
-                                word, result);
+                       netdev_dbg(wlandev->netdev,
+                                  "failed to set channel %d, result=%d\n",
+                                  word, result);
                        goto failed;
                }
 
@@ -1238,8 +1250,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                  HFA384x_RID_CNFPORTTYPE,
                                                  word);
                        if (result) {
-                               pr_debug
-                                   ("failed to set porttype %d, result=%d\n",
+                               netdev_dbg
+                                   (wlandev->netdev,
+                                    "failed to set porttype %d, result=%d\n",
                                     word, result);
                                goto failed;
                        }
@@ -1257,8 +1270,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                        }
 
                        if (result) {
-                               pr_debug
-                                 ("failed to set wepflags=0x%04x, result=%d\n",
+                               netdev_dbg
+                                 (wlandev->netdev,
+                                  "failed to set wepflags=0x%04x, result=%d\n",
                                   word, result);
                                goto failed;
                        }
@@ -1283,16 +1297,18 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                /* Enable the port */
                result = hfa384x_drvr_enable(hw, 0);
                if (result) {
-                       pr_debug
-                           ("failed to enable port for sniffing, result=%d\n",
+                       netdev_dbg
+                           (wlandev->netdev,
+                            "failed to enable port for sniffing, result=%d\n",
                             result);
                        goto failed;
                }
                /* Enable monitor mode */
                result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE);
                if (result) {
-                       pr_debug("failed to enable monitor mode, result=%d\n",
-                                result);
+                       netdev_dbg(wlandev->netdev,
+                                  "failed to enable monitor mode, result=%d\n",
+                                  result);
                        goto failed;
                }